Pull changes from upstream master

Upstream is equivalent to iggy/collectd-formula which is what we've actually been running off of.