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. 
How did the usa_id get removed? Did it go somewhere else?