Fixed a typo in the README. whith -> with
Merge pull request #292 from alderz/fix-typo

Fixed a typo in the README. whith -> with
Create '=' and '%' UltiSnips format shortcuts for eruby files

That matches the snippets for snipmate
Merge pull request #293 from filipegiusti/master

eruby: Create '=' and '%' UltiSnips format shortcuts for eruby files
Fix typo

"cached" now "chached"
Merge pull request #295 from cpjolicoeur/patch-1

Fix typo
Some extensions to service and, primarily, file snippet for puppet
Merge pull request #297 from jby/puppet-snippets

Some extensions to service and, primarily, file snippet for puppet
Add my c / cpp snippets
Fix
Fix 2
Add SFML snippet
Merge branch 'master' of github.com:nyorem/vim-snippets

Conflicts:
	snippets/c.snippets