ContactInfoForm: refactor code to populate state fields
ContactInfoForm: refactor code to populate state fields

Refactor trivially, in anticipation of different areas for billing state
and shipping state.

grengojbo/satchmo,grengojbo/satchmo