Descriptions update

Makes ids, descriptions, and abbreviations to go under the "departments" level in the yaml files. Also, updates layer_with_usa_contacts.py and associated tests. 
I'm sorry. I keep finding things in this pull request that make me uncomfortable. There is now this list of keywords that has been deleted. Where did it go? Is it not relevant anymore?