Fixed some spelling errors in the User Guide.
Merge branch 'master' into revamp-gh-pages