update to clojure 1.6
(not (nil? )) -> some?