Update dependencies and imports for clojure 1.5
Move midje tests into source files
Move the comments into the test description strings.