correcting several minor typos
a missing they, reinstated
merging conflict
Merge branch 'master' into typos
Merge pull request #4 from mermop/typos

Typos