Merge pull request #255 from mancdaz/master

Merged automatically by jenkins after successful build test
End of sprint version bump.
Merge pull request #259 from mancdaz/master

Merged automatically by jenkins after successful build test
Update README.md
initial grizzly updates
Working around Chef::Exceptions::ImmutableAttributeModification issue
Merge pull request #260 from galstrom21/grizzly

Pulling in rackerjoe's grizzly work
Adding in the nova-conductor service.
Merge pull request #261 from galstrom21/grizzly

Adding in the nova-conductor service.
Fixing compute_driver/connection_type settings
Merge pull request #262 from galstrom21/master

Fixing compute_driver/connection_type settings
Using partial templates to seperate out nova.conf variables
moving partials into their own directory
fixing foodcritic violation FC043

  FC043: Prefer new notification syntax
Merge pull request #264 from galstrom21/partial_templates

Merged automatically by jenkins after successful build test