Incorporate changes from clj-wamp-template