Adding json query file support
Merge remote-tracking branch 'origin/master'
Getting querier closer to using json files
Fixing generator
Merge remote-tracking branch 'origin/master'