Misc vimrc updates