Fixed some snippet
Merge branch 'master' of github.com:ricciocri/vimrc

Conflicts:
	snippets/puppet.snippets