Add missing plugins and clean up vimrc