Refactoring for new ODM Query and Query Builder

This is theoretically finished, in as much as all the tests pass. Will test it out in battle later today.

Depends on: https://github.com/doctrine/phpcr-odm/pull/217