Merge branch 'master' of ssh://myelin1.wustl.edu/mainpool/storage/repositories/caret7/caret7_source

Just pulling from repository after a couple of minor changes (My response to GIT asking "Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch."