Fold bundle config back into vimrc