Editing changes for readability/grammar.
Merge branch 'master' into gh-pages