Revert travis change, travis still doesn't run PyPy 2.0.
Modify code and test so it also works with Python 3.
Modify tox file so tests also run with Python 3.
Add lint env to tox.ini.
Also run travis tests under 3.3.