if we use ntpdate ntpd should be off
Merge branch 'master' of github.com:XANi/puppet-modules

Conflicts:
	modules/ntp/manifests/init.pp