Updated a few pieces to include work towards cinder-volumes
Merge branch 'ubuntu-maas' of https://github.com/Tehsmash/grizzly-manifests into ubuntu-maas
Merge pull request #94 from Tehsmash/ubuntu-maas

Added Cinder fix as the volume group and partitions for additional disks aren't managed in preseed