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

This reverts commit a5982a5db4ff22feeec0a977853b63d4976872f7.
Merge pull request #407 from alex/uptodate-pypy

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