Finishing blow

Removing trait checks from holy war, and removing the war checks
decisions entirely.