Merge pull request #390 from dreid/install-pypy-again

Revert "Travis now has an up to date pypy"