edits mostly in conditioning
Merge branch 'master' of https://github.com/probmods/chapters