added the ability to specify the owner and group of ceph.conf
missed a comma
Merge branch 'ceph_conf_ownership' of git://github.com/dontalton/puppet-ceph into dontalton-ceph_conf_ownership

Conflicts:
	manifests/conf.pp
Merge branch 'dontalton-ceph_conf_ownership'