Merge branch 'master' into aie

glossary.tex

@@ -163,7 +163,7 @@
 \newglossaryentry{necromancer}{
 	name={Antonym},
 	first={Antonym, Fallen Priest of Qualm\"{e}},
-	description={is a priest of Qualme, from the time of Noland Beard.  He has since died, but kept himself alive in order to study Song Magic.  Unfortunately, death has robbed him of his voice}
+	description={is a priest of Qualm\"{e}, from the time of Noland Beard.  He has since died, but kept himself alive in order to study Song Magic.  Unfortunately, death has robbed him of his voice}
 	}
 
 \newglossaryentry{forestpriest}{