Merge pull request #21 from oreillymedia/sarah

Changes to glossary markup
some glossary tweaks