Terribly ugly hacks to allow text abbreviations to be changed
Merge branch 'master' into inform7