PEP8
Unused imports
Merge branch 'master' of github.com:BrightcoveOS/Diamond
Merge branch 'master' of github.com:BrightcoveOS/Diamond
spelling
Broader exception catching for ES collector http call

Change-Id: Ic03c518caf443636d5740680b3d55dae34c8a564
Adding new netapp Disk collector
thread-safety; some refactoring
support multiple aws regions and queues
tsdb.py: format metrics more idiomatically

allow metric format to be user controllable
set tag with hostname
allow tags to be configured and passed through
Merge pull request #488 from Dieterbe/multi-sqs-queues

sqs collector: support multiple aws regions and queues
Merge pull request #489 from goraxe/master

tsdb.py: format metrics more idiomatically
Merge branch 'master' of github.com:BrightcoveOS/Diamond
Fix issue with cpu collector test failing incorrectly
Fix reimann tests
pep8
Disable py 2.5 travis
Merge pull request #486 from rtoma/es-fix2

Broader exception catching for ES collector http call
Merge pull request #487 from peterfisher/master

New threaf-safe netapp collectors
Add a link to the mailing list