startings of preparing more than one filesystem and fixed merge commits.
Merge branch 'storage_service' of github.com:youdevise/provisioning-tools into storage_service

* 'storage_service' of github.com:youdevise/provisioning-tools:
  rpearce: Adding common exception handling to image storage
Cleanup after initialisation if it fails
Merge branch 'storage_service' of github.com:youdevise/provisioning-tools into storage_service

* 'storage_service' of github.com:youdevise/provisioning-tools:
  rpearce: Split common functions into a mixin

Conflicts:
	lib/provision/storage/lvm.rb
ANother attempt at fixing dev packages that don't install correctly.
fixups
Partial support for multiple filesystems
Fix merge conflict
Merge branch 'storage_service' of github.com:youdevise/provisioning-tools into storage_service

* 'storage_service' of github.com:youdevise/provisioning-tools:
  Adding missing local spec
rpearce/grichards: Fixing failing tests, we still dont like it.