Merge pull request #346 from rjc123/localmunge

Update to localmunge file movement
Merge pull request #347 from rjc123/localmunge

Change tests to resolve downstream conflicts
Merge pull request #348 from rjc123/localmunge

Update Atomic Mappings