Raise timeout for munin plugins to 15 seconds.

zfs plugins were timing out previously. 15 seconds is a sensible level for all plugins, so we won't be host-specific
Merge nas04:/etc/puppet
Added deny unknown-clients so we only give IP addresses to puppies.

Reported by rss39
Merge dhcp:/etc/puppet