Merge branch 'master' of cloojure.github.com:cloojure/cool