2.07.2:schwarherz:4 some winmerging

Fixed a few unusual differences I noticed in Winmerge. also moved the
aztecs to their own group and gave the christians ai_convert values.
those shouldnt break anything.