Add method on FipsCounty which drops the superfluous 'County'. Fix logic.