Bug fix for and/or clauses being improperly optimized out due to off by
one errors.
Small tweaks for previous commit.
Merge pull request #92 from zzbennett/master

Fixing and/or clauses being improperly optimized out due to off by one issues when only a single document has a value set in a segment