Remove vimdiff as difftool from gitconfig-base
Remove duplicate difftool.prompt from gitconfig-windows
Uncomment the installation of pip from pip install script