Fixed up the puppet manifest
Using exit(0) now instead of return
Merge branch 'enc'
Merge branch 'master' of github.com:crew/dds2

Conflicts:
	puppetmaster/modules/dds2/manifests/init.pp