Parentheses around conditional, refs #91.
Merge branch 'conditional-parentheses' of https://github.com/acrmp/tailor
Relates to gh-148
Cleaned up some style and added docs for conditional_parentheses

Closes gh-148.