clojure 1.5.1 deps
Merge remote-tracking branch 'upstream/master'

Conflicts:
	project.clj