rearrange output, rename a few functions
add examples on how to nest :keys

(Thanks to Karsten on the Clojure mailing list!)