Merge branch 'master' of https://github.com/checkmyws/wooster

Conflicts:
_drafts/collectd-logstash-elasticsearch-kibana.md