Merging in Guv'ner changes to official factions

All changes accepted. Datalinks entry formatting should probably be
reviewed at some point.