Fix tox test runner
Bump version
Clean up from unused Python 2.5 stuff