Fix failing test
Remove pypy from travis until download_corpora issue is resolved
Merge branch 'master' into dev