Fix :keys as well
Fix :keys as well

The defn specs don't catch keywords given for :keys, but the type
mismatch between the keys in :keys and :or prevents the :ors from being
used.

tobias/clojars-web,nberger/clojars-web,clojars/clojars-web,tobias/clojars-web,clojars/clojars-web,tobias/clojars-web,technomancy/clojars-web,ato/clojars-web,ato/clojars-web,nberger/clojars-web,technomancy/clojars-web,clojars/clojars-web