Fix up vimrc plugins