Make compatible with python 2 and python 3

[Juko]

Actually not as crazy as expected. I'm still going to be pushing new tests to this branch so that we can confirm things a bit better...

Much easier to look at commit by commit. Click the commits tab, then the first commit, then use n to go to the next commit automagically