Use PyPy 2.3 on OS X
Merge branch 'master' into pypy-2.3
ugh. good system.
Merge pull request #1030 from alex/pypy-2.3

Use PyPy 2.3 on OS X