Merge pull request #101 from MirantisDellCrowbar/feature/folsom/master

Improve folsom stuff
Add simplest Cinder support

Conflicts:

	chef/cookbooks/nova/recipes/volume.rb
	chef/data_bags/crowbar/bc-template-nova.json
	crowbar_framework/app/models/nova_service.rb

trying to cherry-pick cinder support from pfs
trying to cherry pick cinder support from pfs
Merge pull request #109 from MirantisDellCrowbar/feature/cinder/betty/folsom-dell

(folsom) Testing continues, but to enable others to easily test with these changes, I'm merging it now.
Merge pull request #1 from crowbar/feature/folsom/master

Feature/folsom/master