First try at python3 support
More python2to3
Merged from master
Changed to work with Python3
Changed to work with Python3
Forgot to remove a blank line
Merge branch 'master' into python3_support