Merge pull request #2462 from reaperhulk/pypy4-mac

pypy 4 for travis mac builders