Use the newer, better snipmate fork.
Add vim-snippets.