Fixed some variable Typos in Query Object and set better defaults to
conform to the data on Kat's machine
Merge branch 'aws' of https://github.com/IVPR/Weave.git into aws