Finish merging the glossary.  Delete temporary files.  Re-remove l10n from JSON variables.
Merge pull request #10 from lauraxt/master

Finish merging glossary, clean up temp files, unbreak some l10n