Add 3 departments to DEPARTMENT_MAPPING

Bringing over changes from
https://github.com/alphagov/backdrop-collector-plugins/pull/14
Fix UKVI code

Bringing in changes from:
https://github.com/alphagov/backdrop-collector-plugins/pull/15
Merge pull request #8 from alphagov/update-dept-mapping

Update dept mapping