Additional py3k fixes
Move version info into setup.py (not required elsewhere) and bump
Grr wrong string type six attr

Also, add six to setup.py derp