More Vimrc updates