Tox

added pypy support. And some minor tweaks.