Merge pull request #243 from zijistark/beta

No more silly triggered modifiers implementing our laws!
Fixed missing decisions
Peace pledge nonsense removed
Minor CB fix
History fix for Tarragona
History fix for Albarracin