Migrated to Clojure 1.6.0

Minor changes to run on Clojure 1.6.0 with hiccup