Merge pull request #93 from rjc123/master

New mappings for DFID and FCO