Fix python 3 stuff
Using tox now, and testing against pypy.