COMP: tweaks to get BRAINSTools building
COMP: update some git tags, and backport the VTK6 stuff