As a non-US client, I want the country to match the form address type so that I don't have to manually change every new non-US entry. **Exit Criteria:** - [ ] Use the Address Type field in the Address form settings to determine what country to send - International - " " (send a space, or dash if necessary) - United States - "United States" - Canada - "Canada"  <!--- @huboard:{"order":0.9995001499650069,"milestone_order":0.9995001499650069,"custom_state":""} -->