prefer if over iff
various docs fix ups
Merge pull request #431 from calabash/feature/misc-doc-clean-up

misc docs clean up