and/or now short-circuit

 Updated to reflect that and/or actually short-circuit now.
Merge pull request #528 from bcj/patch-2

and/or now short-circuit