Upgrade to PyPy 2.3.1
Merge pull request #330 from alex/patch-3

Upgrade to PyPy 2.3.1