Merge pull request #1 from logsearch/collectd

Add collectd package/job
Merge branch 'master' into use-extra-logstash-filters

Conflicts:
	jobs/log_parser/templates/config/filters_pre.conf.erb
Update nginx to 1.4.7 and fix log_parser config
Create final version 4