1.2 to 1.5 conversion

Everything converted to clojure 1.5