gVim for Windows with customized vimrc, diff util and plugins