Merge pull request #27 from marcesher/master

Mongo Integration Tests
Clean up whitespace and indentation
Merge pull request #28 from cndreisbach/whitespace

Clean up whitespace and indentation
Adding more integration tests against the query/mongo layer