Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow