Add some extra snippets and modified old ones - more puppet-lint consistent now