stuff
Merge branch 'master' of github.com:hcs/puppet-config

Conflicts:
	modules/zfs/manifests/init.pp