Merge pull request #88 from rjc123/master

New mappings for Wales Office and Cabinet Office