Merge pull request #389 from alex/glossary-consistency

Make capitalization in the glossary consistent and sort it