Change STATE_ABBR to not include territories by default

Added on STATE_AND_TERRITORIES_ABBR so that users can include territories if needed.