remove pypy from travis tests
Merge branch 'travis'