gitconfig and a few vim updates