add heroku deployment info to travis.yml
Merge branch 'dev'