winmerge began

removed conflicting files where CK2+ seemed to have better versions.
Changed numerical values to Plus values. Added mechanics FROM plus to
the others. Still more to do.