Upgrade PyPy in our tests
Merge pull request #1360 from dstufft/upgrade-pypy

Upgrade PyPy in our tests