Merge pull request #632 from alex/glossary-public-key

Document public key and private keys in teh glossary