updated extraction crosswalk
Fix merge conflict
update for city-county consolidations
Merge pull request #314 from jpecht/master

data updates