Merge pull request #238 from rackerjoe/work

Merged automatically by jenkins after successful build test
End of sprint version bump.
move cinder_catalog_info to correct place
fix perms on nova-compute.conf that was preventing nova-compute from starting
Merge pull request #239 from mancdaz/master

Merged automatically by jenkins after successful build test
ENHANCEMENT: Default to Folsom