Various updates to .vimrc; replaced Vundle with latest