Improve the checks for vim / git