Fixed puppet style issues, updates for 2.7+ Puppet and changed templates to allow zabbix auto configuration.