Minor fixes to street address parser:
Strip out 'United States' or any variant of it from the end of the string.
Allow for whitespace and commas at the end of string when parsing zip and state.