Fixed naming of objects in the Query object to match AWS Library API
Added in ability to import a JSON query file and then execute it. I am
unable to test it, so someone will need to test it with a legitimate
query.