Manual merge of new faction system (#256).
Clean up some personal signatures.