merge 2013-08-15-deploying-clj-compojure-in-heroku