fixed up some yaml parsing stuff

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

Signed-off-by: markhpc <mark.a.nelson@gmail.com>

Conflicts:
	cbt/benchmark/rbdfio.py
	cbt/common.py