recursively encode queries, closes #534
refactor mongo reserved keys, closes #519
Merge pull request #535 from modilabs/or-534

Or 534