Added better cleanup and monitoring.

Signed-off-by: markhpc <mark.nelson@inktank.com>
Merge branch 'master' of https://github.com/ceph/ceph-tools