Feature/mongo 2.6.5 expressions add and or

This is a combination of Add, And, and Or expressions.  They were combined due to changes not being contained to the individual expressions in the branches.