Auto deployment from travis-ci to heroku
Merge branch 'heroku'