Merge branch 'master' of github.com:jamesjcook/pipeline_utilities

git-svn-id: svn+ssh://civmxsrv2.duhs.duke.edu/Users/civmsvn/svn/repos/pipeline_utilities/trunk@2217 d41079a3-eaa1-4f09-8506-b324c47726bb
Merge branch 'master' of github.com:jamesjcook/pipeline_utilities