Merge pull request #267 from rjc123/master

revert to previous implementation
Merge pull request #268 from rjc123/master

eliminate deduplication logic from munge.rb, deferring to tidy-mappings