Limit stateAbbr to 50 states (no districts or territories), and fix state names

Fixes #234