Update .vimrc

Much needed update of latest .vimrc file