Merge pull request #104 from zijistark/alpha

Un-revert combat traits to new versions
Lowered warscore from battles
Tweaked culture spread
Encouraged holy war
Iberian events fix
Marriage logic
Fix to long-time imperial conquest CB effect localisation bug

Added some inline documentation, as best I can formalize, of exactly
how vassalize_or_take_under_title works as well. Probably should put
these things in the GitHub Wiki.