Feature/seqware 1927 pegasus cleanup and assorted

Please do not close. 

This is for me to run through the regression tests.