Merge And/Or Predicates like we do with Ord Predicates?

[epage]

There is just a lot of code there. We could do this or we probably should make a boolean folder.

Also, while breaking things, should we rename this "logic" or something?

[epage]

The logic for and/or has gotten complex enough that I'm not going to bother