Merge pull request #407 from alex/uptodate-pypy

Revert "Revert "Travis now has an up to date pypy""