Merge pull request #311 from jpecht/master

update
limited selections in select box; crosswalk update
merged changes
Merge pull request #312 from jpecht/master

updated crosswalk so "total county" always points to administration whic...
Merge pull request #313 from jpecht/master

companion update, minor update
Added a data inventory that reads from JSON
Merge branch 'master' of github.com:nikAleksandr/CIC
updated extraction crosswalk
Fix merge conflict
update for city-county consolidations