Use clojure 1.5.1
Roomkey project.clj
Merge branch 'clojure-1.5.1'
Merge branch 'rk-project'

Conflicts:
	project.clj