Update clout dependency (1.1.0)
Merge pull request #67 from ptaoussanis/patch-1

Update clout dependency (1.1.0)
Added Codox plugin for generating documentation
Ensure that `render` retains the metadata on any provided response map
Merge pull request #73 from cemerick/master

Ensure that `render` retains the metadata on any provided response map
Ensure that `render` retains the metadata on any provided response map
Released 1.1.4
Updated README to use latest Compojure version
Set version to 1.2.0-SNAPSHOT
Updated HISTORY
Merge branch '1.1'

Conflicts:
	project.clj
Updated Codox plugin to 0.6.4
Updated ring-core dependency to 1.1.7
Updated ring-core dependency to 1.1.7
Released 1.1.5
Merge branch '1.1'
Updated copyright year