DATAMONGO-689 - Query Mapper does not correctly handle queries with AND and OR.

Added test cases that demonstrate that this works as expected.

Original pull request: #42.