Flatten option groups.

Previously, option groups would be rendered incorrectly.
Full support is not yet implemented, but all options
will at least be rendered.
Bug: Incorrect variable name in field_choices repr
Added field_choice_groups tag