added memory_docker collector
Revert "force pybuild to use setuptools"

This reverts commit 1c444ad8f5ff31b288a12dce7db11dc16103f620.
Revert "update debian package to use pybuild"

This reverts commit 2ab2369dd74ef5622b719c35a5beec6e683ebe34.
Merge pull request #578 from nikicat/master

added memory_docker collector
Fix diskspace collector's formatted disk names.
Merge pull request #579 from chrisbolt/master

Fix diskspace collector's formatted disk names.
Fix logging bug.
Merge pull request #584 from shoonoise/master

Fix logging bug in httpjson collector
BUGFIX: they are functions, not data attributes
Merge pull request #587 from hvnsweeting/hvn-fix-proc-attr

BUGFIX: they are functions, not data attributes
Updated to remove a division by zero

Using btrfs as fs lead to a report of 0 inodes, creating a division by zero:

[2014-04-18 20:58:26,570] [Thread-11] Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.7/diamond/collector.py", line 423, in _run
    self.collect()
  File "/usr/share/diamond/collectors/diskspace/diskspace.py", line 263, in collect
    float(inodes_free) / float(inodes_total) * 100)
ZeroDivisionError: float division by zero

Test : 

>>> data = os.statvfs('/opt/data')
>>> data
posix.statvfs_result(f_bsize=4096, f_frsize=4096, f_blocks=44564480, f_bfree=26219965, f_bavail=25761775, f_files=0, f_ffree=0, f_favail=0, f_flag=4096, f_namemax=255)


Will look into it to add btrfs support...
Merge pull request #588 from prune998/patch-1

Updated to remove a division by zero