Add git-difftool setting
Add .vimrc.local to gitignore.global
Now <CR> does not cause completion in cmdwin in vim