Upgrade schema and plumbing dependencies

Main changes are that macros in schema.macros have been moved to schema.core.
I've just been leaving the include-macros in unconditionally -- Clojure doesn't seem to care about it, any reason I should be doing this instead?