Reformat systemstat.py
collector.conf.erb: add 'file managed by Puppet' header
diamond.conf.erb: add 'file managed by Puppet' header