Merged in Cygwin vimrc