Remove pypy as a default env until it is supported
Merge branch 'master' of github.com:crypto101/merlyn

This merges a change in the travis configuration.