Removed ability for Travis to deploy to Heroku
Merge branch 'dev'