Merge pull request
#663 from takluyver/py3compat...
Merge pull request
#663 from takluyver/py3compat
Python 3 compatibility work. This doesn't fully get us to a single codebase supporting py2/3 at install time, but it does make significant progress in that direction.