improving tox settings
making sure it builds with pypy
1.1.5
Merge changes with @spulec's python 3k branch