improved filestat to also collect data per user per file type (this is disabled by default)
init s3bucketcollector
Merge remote-tracking branch 'upstream/master'
Fix an undefined var issue
Fixes #227, this switches the counter metrics over to using publish_counter and the gague metrics to using publish_gague, this should prevent the counter metrics from not being derivatived
Travis-ci doesnt support python 2.4. Whoops :(
Test if we run on pypy
Answer: no
Added tracking for:
    ActiveOpens => Counter for number of TCP connections opened
    PassiveOptns => Counter for number of TCP connections accepted

Fixed TCP collector to use "gauge" logic for "CurrEstab"
Merge pull request #228 from reyjrar/master

TCP Collector Updates
Merge branch 'master' of github.com:BrightcoveOS/Diamond
collect stats for queues on all vhosts, not just /
Merge pull request #229 from smaftoul/patch-1

collect stats for queues on all vhosts, not just /
build: add --match 'v*' to git-describe invocation

Jenkins adds a bunch of its own tags to a checked out repo - make sure
we're basing the version number on the diamond tag.
Merge pull request #230 from SocialCodeInc/master

build: add --match 'v*' to invocation of git-describe
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