model_type() needs to be organized/cleaned up

[brifordwylie]

Right now we use both the enumerated type and the string type randomly. We should figure out exactly what we want to do. I think we'll mostly use the enumerated type except for manual onboarding where we want users to be able to type "regressor", etc.