2.05.4:schwarherz:17 maintenance and nickname

Made the "The Heathen" nickname actually possible to get, put in
Jordarkelf's Norman Conquest and War of the Two Eriks cleanups.