Add city and state to permitted params for user devise and add word boundaries to state abbrev format validation