Merge pull request #73 from mergeconflict/mergeconflict/56-heroku

fix #56: add heroku plumbing
Merge branch 'master' into mergeconflict/56-heroku