added memory_docker collector
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.