[TH] merge the va output types

VA has a number of cities that sort of act like
counties for election purposes. This isn’t a great
long term solution, but until we’re prepared to
handle these properly, merging them allows us to
use the cities as well.

Assigning to @bwreid