Adding AWS and Rackspace Cloud