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

Upgrade PyPy in our tests (1.5.X)