Backport of PR #109 from 0.2 branch
Merge pull request #114 from dotcloud/backport-memorymon-tweaks

Backport of PR #109 from 0.2 branch