improved mapping when choices is present
added form_name property to a field; the default value is populated with a titlized version of the field name; also added the property name to the base type which is a readonly property on field_name
fixed a problem converting EmailType