Add some initial tests
Add testing config
Drop Python 2.7 support from travis
Merge branch 'master' into heroku