Merge branch 'takowl-ipy3-preparation' into trunk...
Merge branch 'takowl-ipy3-preparation' into trunk
This branch cleans up our trunk to make a 2to3 run be as painless as
possible, while keeping our code fully 2.6-compatible.
Closes gh-159 (pull request).