Converted everything with 2to3
Merged py3k - Run 2to3