Use vim-snippets instead of snipmate-snippets
Merge pull request #333 from benvds/3.0

Use vim-snippets instead of snipmate-snippets
Use vim-snippets instead of snipmate-snippets
Merge pull request #335 from benvds/3.0

Update snippets directory & docs
Merge remote-tracking branch 'upstream/3.0' into 3.0

* upstream/3.0:
  Use vim-snippets instead of snipmate-snippets
  Use vim-snippets instead of snipmate-snippets