More vimrc updates