6/9 edits to text
Merge branch 'master' into gh-pages