Fixed small typo in query
Partially re-indented core.clj
Adapted mockshedules to schema changes
Adapted all current query tests. They all pass.
Merge remote-tracking branch 'origin/master' into nilsbranch