copy vocabulary changes from metadata mapping xls
new organization ids, fix keys
new department numbers, fix keys, add missing orgs
don't hyphenate org shortforms that are same in English and French
always use shortform for org title, even if it's just a department number
Merge pull request #118 from wardi/master

Organizations: fix to import remaining few, add department numbers