Some fixes, and refactoring of the lexicon and abbreviation remapping into headers where it can be picked up by the scripts that generate the voice files.
