Moved to clj 1.6; removed clojure-contrib