Added args to encoding categorical to have higher level control over which features to encode
Fixed merge conflicts