Upgrade to PyPy 2.3.1

@dstufft, am I doing this right?
do we need to keep this pypy around?