Run tests with pypy on travis
Merge branch 'travis-pypy'