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. 
Keywords keep on changing when I run keywords_from_fr.py, I'll run everything again and see what happens.