Merge pull request #231 from zijistark/alpha

Embargo CBs have a description (vanilla bug)
FIX: Non-bordering Holy War properly enforces CA restrictions