Fix GPMONGODB-296

Sub-criteria are now wrapped in $and or $or, if there is more than 1 of them.
This fixes queries with two ors in them.