Query operator improvements and, or, not, nor
Query operators and tests
Some cleanup, docstrings, and tests