Second use of automunge
Merge pull request #339 from rjc123/newmappings

Second run of automunge