Updated vim and vimrc