First working 3.x version

- Basically just some manually-targeted 2to3 work...