Use snipmate from git.
Remove vim/bundle from git.
Install vundle during setup.