Fix elasticsearch 0.90 fielddata stats.
Merge pull request #407 from barnybug/master

Fix elasticsearch 0.90 fielddata stats.
Fixes #404, this adds in a way to specify a directory to load handlers from
PEP8
Tox is broken for python 2.5
add count_workers options to count number of workers, set False to default
Merge pull request #408 from huoxy/add-count-workers-support

add count_workers options to count number of workers
Merge branch 'master' of github.com:BrightcoveOS/Diamond
Option to filter published queues
Merge pull request #409 from pzinovkin/rabbitmq_queues

Option to filter published queues for RabbitMQ collector
Fix typo "handername" vs "handlername"

Solves NameError when using a configuration file to provide handlers.
Merge pull request #410 from duego/fix_handlers_typo

Fix typo "handername" vs "handlername"
add try..except to fix ProcessesResourceCollector
Merge pull request #411 from huoxy/fix-processesresource

add try..except to fix ProcessesResourceCollector
AMI endless loop fix, formatting changes
Merge remote-tracking branch 'upstream/master'