Finally merge 'MomsData' into master
Finally merge 'MomsData' into master

The lines that are deleted here should have not gone into the "merged" product
of the branches. I had to back and look at the merging conflicts to see this
clearly

PPMstar/PyPPM,PPMstar/PyPPM