Change the AND and OR operators to use boolean equivalents for easier replacement.
Merge pull request #17 from jordandukart/7.x

Change the AND and OR operators to use boolean equivalents for easier re...