added a class OutputAndSampleMacro
Merge branch 'master' of https://github.com/salilab/pmi