Merge pull request #1670 from reaperhulk/pypy25

use pypy 2.5 on our os x builders