Formatting changes
Change a few minor things to bring openstack in line with rackspace