Merge pull request #417 from mk270/feature/heroku-integration

Feature/heroku integration
Merge branch 'master' into culttag-deployable