Replacing {mixin → trait} in CLS

The need of having CFRs is coming. Traits will be a hybrid between mixins and traits, probably more like traits, but with essential features of mixins. Unfortunately there is no word for this, but trait seems more appropriate now.