Merge Integrating back into master

BamM now produces output compatible with GroopM. Time to go back onto the master branch.