merge with clojure-1.5.1
reenable dada-clojure