Updated to Clojure 1.5.1 and changed to load on demand