More vimrc / vim plugin updates