Merge pull request #1788 from alex/pypy-2.5-osx

Use PyPy 2.5.1 on Travis OS X