Loadavg collector: use platform independent os.getloadavg() instead of /proc/loadavg
Ported docs on configuring Nagios from Metricinga to the NagiosPerfdataCollector.
Merge pull request #495 from craigcalef/nagiosperfdatadoc

Ported docs on configuring Nagios from Metricinga to the NagiosPerfdataCollector.  Originally from jgoldschrafe/metricinga
bug fixes; style changes
Merge branch 'master' of https://github.com/BrightcoveOS/Diamond
Revert "bug fixes; style changes" - Didn't notice upstream changes

This reverts commit cd49e4014fa21cb87f229ee15c4923272659dc6d.
bug fixes
Merge pull request #497 from peterfisher/master

bug fixes
elasticsearch: support for grouping stats for logstash indices

Change-Id: Iba0aee3a8de34ee83e68499d7d5a9ebc947485e5
Merge pull request #498 from rtoma/es

elasticsearch: support for grouping stats for logstash indices
New version of pep8
New version of pyflakes
Doc updates
adding in sidekiqweb collector
Merge pull request #500 from mzupan/master

adding in sidekiqweb collector
pep8
Fixes #499, this fixes the issue where the config bool is parsed as a string
Doc updates
FIXBUG: s in finally is undefined if exception happens

and remove an uneccesary nested try
Merge pull request #501 from hvnsweeting/hvn_fix_postfix

FIXBUG: s in finally is undefined if exception happens