Filters

Created a Filter type to use for creating where clauses.  This is mainly useful for having a where clause that is ORed together instead of ANDed.
Merge branch 'query-plans'