rackspace-cookbooks Changes

Merge back rackspace-cookbooks changes