Merge branch 'master' of https://github.com/acliu/strawman
Tweaked contributions of theorists.
Tweaked contributions of theorists again.
Merge branch 'master' of https://github.com/acliu/strawman
Only very minor start to fixing facilities.
Merge branch 'master' of https://github.com/david-deboer/strawman