rewrite normalizeCriteria to fix OR + CONTAINS bug

Fixes the bug mentioned in https://github.com/balderdashy/sails-mongo/issues/59