Merge of heroku-buildpack-clojure and heroku-buildpack-phantomjs