Upgrade to Clojure 1.5, bump to 2.0.0
Cleanup code