Added the two alternative PB holy war CBs to faction ultimatum war checks
Slow down elective faction ultimatums a bit
Moderate nerf to the elective faction
Slight speedup of elective faction ultimatum, post-nerf
Merge pull request #60 from zijistark/ziji-dev

Moderate nerf of elective faction & some consistency fixes