Merge pull request #1351 from alex/pypy-2.4

fixes #1340 -- use pypy 2.4.0 now that it's out