Added puppet function snippets
Merge remote-tracking branch 'upstream/master' into feature/function_snippets

Conflicts:
	UltiSnips/puppet.snippets
Merge pull request #82 from pjfoley/feature/function_snippets

Added Puppet Function Snippets