improved filestat to also collect data per user per file type (this is disabled by default)
init s3bucketcollector
Merge remote-tracking branch 'upstream/master'
Test if we run on pypy
Answer: no
Merge branch 'master' of github.com:BrightcoveOS/Diamond
Merge branch 'master' of github.com:BrightcoveOS/Diamond
Move MaxConn to be a gague and fix tcp unit testing
Fix rabbitmq test
pep8
Add in note about needing IO before iostat metrics will show
Add in a time convertor
Add in a basic puppetdb collector
Merge pull request #225 from CBarraford/master

s3bucket collector, and enhanced file stat collector
Per #225, add in a flag to lsof to attempt to skip any kernel blocking calls. Should be safe.
Add in a s3 import test and pep8 fixes
Pyflakes fixes
Fixed rabbitmq vhosts

I some how copied wrong stuff in my last PR, sorry !
Also, metric names don't contain vhost name.
If two vhosts have the queues with the same name, the metrics will collide.
Merge pull request #231 from smaftoul/patch-2

Fixed rabbitmq vhosts
Fix test per #231