Fix Travis!

Closes #681. I didn't really feel like trying to squash. This also implements #680, largely due to me miscounting SHA1s.
Can't you just check `$TRAVIS_PYTHON_VERSION == 'pypy'` and do the magic here instead of Makefile?