More changes to port to Python 3
All tox tests pass now!!
26 files changed