Closes #2, #3.

The code to fix #2 is hacky because the country field is free form text.
I've compared the country to "USA", "United States" and "US" before adding
a "+1" to the phone number. If the field were constrained to a drop-down,
this could be handled more cleanly.