Further vimrc updates