Move things around to eliminate kitchen-sink
Merge branch 'master' of https://github.com/clojure-cookbook/clojure-cookbook