Make capitalization in the glossary consistent and sort it
Merge branch 'master' into glossary-consistency
Correct spelling, fix phrasing, line wrap.
Merge pull request #389 from alex/glossary-consistency

Make capitalization in the glossary consistent and sort it
Merge pull request #391 from alex/spelling-fixes

Correct spelling, fix phrasing, line wrap.