Moved to clojure 1.5, removed contrib dependency, added tests