more detailed elasticsearch collector with cache support
fix transport location
Merge pull request #236 from jibs/master

More detailed elasticsearch stats
Re #236, make two keys optional depending on if we get them in the reply or not. Fixes current unit test for elasticsearch.
Merge pull request #237 from tommyulfsparre/master

Don't write to stderr when daemonized
Merge branch 'master' of github.com:BrightcoveOS/Diamond
Pep 8 fixes
make sure per collector only one collect() at a time
Merge pull request #238 from Dieterbe/one-collect-at-a-time

make sure per collector only one collect() at a time
Fix typo in #238
Add Openstack Swift Recon collector

Add a collector for reporting 'recon' metrics for OpenStack Swift via
the recon cache files. This covers all of the existing recon metrics and
should cover future metrics since it just walks the dict entries.
Include unittests and an empty files fix

Update unittests to include parsing sample *.recon content. It includes an
empty account.recon, a malformed container.recon, and valid object.recon file.
Merge pull request #240 from pandemicsyn/master

Add a Swift Recon Collector
Re: #240, this adds in python 2.4 support to the OpenstackSwiftReconCollector
Doc updates
Install simplejson for travisci
Add in example metrics to the docs for OpenstackSwiftReconCollector