Remove snipmate again, god dammit.
Add it back as vim-snipmate.