Use tox on travis.
uninstall travis installed pypy.
Don't dist-upgrade.
Fix error on removing travis pypy
Merge pull request #161 from methane/master

Use PyPy-2.1 on Travis