Travis -> Heroku
Merge branch 'master' of https://github.com/Corvidian/wadror