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
moving, renaming
Merge pull request #29 from marcesher/master

Mongo Integration Tests
Merge from master
Fixed broken integration tests