Specified puppet 3.6.0 for installation
Updated puppet with 30m intervals and added splaying
Merge branch 'master' into centos

Conflicts:
	puppet-bootstrap.sh