Merge pull request #1030 from alex/pypy-2.3

Use PyPy 2.3 on OS X