Merge branch 'master' into mergeconflict/56-heroku
sbt 0.12.4 unsupported by heroku
fixing interface and port
Merge branch 'master' into mergeconflict/56-heroku
Merge pull request #76 from mergeconflict/mergeconflict/56-heroku

fix #56: add heroku plumbing for real this time