Finally syncing in CM changes

Not done yet, but progress!
Chris:  Could you take a look at L121 in ff2_1st_set_abilities and see
if I did the right thing?  Thanks.
Will compile later if I remember.