Minor updates/additions/fixed for Diamond
Minor updates/additions/fixed for Diamond

src/collectors/example/example.py
  doc Update for simpler way for testing a module, especially those that require
  running multiple times to gather metrics

src/collectors/files/file.py
  New FilesCollector that will collect metrics from file(s) placed in a pickup directory
  options:
   'dir':     'The directory that the performance files are in'. Default /tmp/diamond
   'delete':  'Delete files after they are picked up', Default False
   'path':    'additional prefix added to metrics collected'.  Default '.' (don't add a prefix)

  File format is just lines of
  metricname.metricname.whatever:10.2
  another.value:12345

src/collectors/cpu/cpu.py
  New option 'normalize' (default false).  When set to true, 'total' cpu metrics are divided
  by the number of cores (so that total is always 0-100%)

src/collectors/diskusage/diskusage.py
  New option 'send_zero' (default false).  When set to true, metrics are still sent to grapite
  even if there was no IO during the previous period

src/collectors/diskspace/diskspace.py
  New metrics for _percentfree and inodes_percentfree

thardie/Diamond,works-mobile/Diamond,thardie/Diamond,Netuitive/netuitive-diamond,TAKEALOT/Diamond,codepython/Diamond,janisz/Diamond-1,janisz/Diamond-1,actmd/Diamond,works-mobile/Diamond,h00dy/Diamond,sebbrandt87/Diamond,krbaker/Diamond,Clever/Diamond,jriguera/Diamond,szibis/Diamond,acquia/Diamond,metamx/Diamond,actmd/Diamond,dcsquared13/Diamond,Slach/Diamond,skbkontur/Diamond,signalfx/Diamond,codepython/Diamond,Ormod/Diamond,rtoma/Diamond,works-mobile/Diamond,TinLe/Diamond,russss/Diamond,eMerzh/Diamond-1,EzyInsights/Diamond,socialwareinc/Diamond,MichaelDoyle/Diamond,hamelg/Diamond,Basis/Diamond,socialwareinc/Diamond,anandbhoraskar/Diamond,EzyInsights/Diamond,joel-airspring/Diamond,works-mobile/Diamond,cannium/Diamond,signalfx/Diamond,rtoma/Diamond,Nihn/Diamond-1,MichaelDoyle/Diamond,Nihn/Diamond-1,cannium/Diamond,stuartbfox/Diamond,ramjothikumar/Diamond,hamelg/Diamond,jumping/Diamond,hamelg/Diamond,skbkontur/Diamond,cannium/Diamond,mzupan/Diamond,Netuitive/netuitive-diamond,jumping/Diamond,krbaker/Diamond,Ormod/Diamond,dcsquared13/Diamond,Netuitive/Diamond,sebbrandt87/Diamond,timchenxiaoyu/Diamond,metamx/Diamond,socialwareinc/Diamond,zoidbergwill/Diamond,hamelg/Diamond,Ssawa/Diamond,sebbrandt87/Diamond,mzupan/Diamond,jriguera/Diamond,Nihn/Diamond-1,TinLe/Diamond,EzyInsights/Diamond,jaingaurav/Diamond,Ssawa/Diamond,mfriedenhagen/Diamond,hvnsweeting/Diamond,python-diamond/Diamond,Clever/Diamond,gg7/diamond,Ormod/Diamond,dcsquared13/Diamond,saucelabs/Diamond,Basis/Diamond,bmhatfield/Diamond,anandbhoraskar/Diamond,Slach/Diamond,saucelabs/Diamond,tuenti/Diamond,Ormod/Diamond,TinLe/Diamond,tellapart/Diamond,tuenti/Diamond,disqus/Diamond,saucelabs/Diamond,mfriedenhagen/Diamond,Netuitive/netuitive-diamond,Ensighten/Diamond,tuenti/Diamond,zoidbergwill/Diamond,disqus/Diamond,zoidbergwill/Diamond,bmhatfield/Diamond,cannium/Diamond,eMerzh/Diamond-1,jaingaurav/Diamond,Precis/Diamond,russss/Diamond,joel-airspring/Diamond,Precis/Diamond,szibis/Diamond,szibis/Diamond,tellapart/Diamond,janisz/Diamond-1,tuenti/Diamond,TAKEALOT/Diamond,Precis/Diamond,krbaker/Diamond,datafiniti/Diamond,codepython/Diamond,CYBERBUGJR/Diamond,datafiniti/Diamond,Netuitive/Diamond,saucelabs/Diamond,dcsquared13/Diamond,Slach/Diamond,szibis/Diamond,tusharmakkar08/Diamond,Ensighten/Diamond,hvnsweeting/Diamond,eMerzh/Diamond-1,Ssawa/Diamond,rtoma/Diamond,rtoma/Diamond,MichaelDoyle/Diamond,TAKEALOT/Diamond,russss/Diamond,gg7/diamond,disqus/Diamond,ceph/Diamond,ramjothikumar/Diamond,acquia/Diamond,stuartbfox/Diamond,russss/Diamond,hvnsweeting/Diamond,jriguera/Diamond,CYBERBUGJR/Diamond,ceph/Diamond,ceph/Diamond,sebbrandt87/Diamond,jriguera/Diamond,janisz/Diamond-1,ramjothikumar/Diamond,krbaker/Diamond,jumping/Diamond,Netuitive/Diamond,eMerzh/Diamond-1,CYBERBUGJR/Diamond,h00dy/Diamond,TinLe/Diamond,stuartbfox/Diamond,socialwareinc/Diamond,Basis/Diamond,h00dy/Diamond,python-diamond/Diamond,mfriedenhagen/Diamond,bmhatfield/Diamond,tusharmakkar08/Diamond,gg7/diamond,acquia/Diamond,h00dy/Diamond,thardie/Diamond,bmhatfield/Diamond,mzupan/Diamond,mzupan/Diamond,Netuitive/netuitive-diamond,Netuitive/Diamond,EzyInsights/Diamond,Ensighten/Diamond,tusharmakkar08/Diamond,ceph/Diamond,Nihn/Diamond-1,MichaelDoyle/Diamond,datafiniti/Diamond,anandbhoraskar/Diamond,timchenxiaoyu/Diamond,Clever/Diamond,joel-airspring/Diamond,gg7/diamond,tellapart/Diamond,jaingaurav/Diamond,signalfx/Diamond,skbkontur/Diamond,stuartbfox/Diamond,Ensighten/Diamond,python-diamond/Diamond,jumping/Diamond,skbkontur/Diamond,CYBERBUGJR/Diamond,timchenxiaoyu/Diamond,metamx/Diamond,actmd/Diamond,tellapart/Diamond,joel-airspring/Diamond,zoidbergwill/Diamond,signalfx/Diamond,thardie/Diamond,acquia/Diamond,TAKEALOT/Diamond,anandbhoraskar/Diamond,timchenxiaoyu/Diamond,Clever/Diamond,tusharmakkar08/Diamond,Basis/Diamond,hvnsweeting/Diamond,Ssawa/Diamond,mfriedenhagen/Diamond,jaingaurav/Diamond,ramjothikumar/Diamond,actmd/Diamond,Precis/Diamond,Slach/Diamond,codepython/Diamond,datafiniti/Diamond