Fix python 3 stuff
Using tox now, and testing against pypy.
Fix unnecessary test repetition, hopefully.
Or not
I was lied to
Fix obsolete CLI for python 3, sorta, I think.
Hardcode six.py for now, because fuck this.
0.2.5 ready
Merge branch 'develop'