update travis
Merge branch 'master' of https://github.com/Fittr/fittr
Merge pull request #74 from Hendrixer/master

Heroku changes