renable pypy on travis
Merge branch 'develop' of github.com:universalcore/elastic-git into develop