Update with heroku/master

This merge pulls in the most recent commits on `heroku/heroku-buildpack-clojure`. We pushed a hello world app to `api.run.pivotal.io` and it still worked.