Don't let the vcs detection cross mount point boundaries
Fixes issue 625
Merge remote-tracking branch 'dbrodie/fix_625' into develop