Switch to vim-snipmate, bump vundle