first tranche of edit to line 118
in-text edits from line 118 onwards
merge latest upstream; fix a conflict in .Rmd
Merge pull request #1 from gavinsimpson/master

In-text edits to draft Simon circulated in early July