Merged changes form win vimrc to ubuntu vimrc