[PD-452] Fix State filters (merge branch)

Applied against my new merge branch, but otherwise does the same thing-- uses state synonyms for state filtering and also expands the states json file to include missing territories.
It's not Python, but let's keep the spacing consistent with spaces instead of tabs.