Rename enable_hack to enable_vol_space

Also fixed expert_disk typo(s) in the comments
Merge branch 'disk_config' of https://github.com/robertstarmer/grizzly-manifests into disk_config

Conflicts:
	manifests/site.pp.example