Swimtools cleanup#1073

baltzell merged 2 commits intoswim-baltzellJeffersonLab/coatjava:swim-baltzellfrom

swimtools-cleanupJeffersonLab/coatjava:swimtools-cleanupCopy head branch name to clipboard