removed heroku deploy from travis.yml
Merge remote-tracking branch 'remotes/origin/master' into feature/#12