s/host/agent/
s/host/agent/
Merge branch 'master' of github.com:boourns/capacity-monitor

Conflicts:
	app/models/newrelic_metric.rb