Add option to prevent resource conflicts with ssh modules
Merge branch 'resource_fixes' of github.com:/convectionlabs/puppet-duo_unix into resource_fixes

Conflicts:
	README.md
	manifests/apt.pp
	manifests/generic.pp
	manifests/yum.pp