merge departments whose names changed slightly
Merge pull request #67 from wardi/master

metadata schema: eliminate some duplicate departments