Updated config for git 1.9 and vim 7.4