Update for clojure 1.6.0 and clean up a bit.