Change multiple_choice_with_other

[vr2262]

Instead of having distinct multiple_choice and multiple_choice_with_other types, we can look for a with_other flag in the JSON column. This should be a little cleaner since it is something of a hassle to have these two types that are almost identical.