> bootstrap no longer works by requiring ...

Ah, I see why this creates a problem. But I'm not sure that wrapping this in some ```if``` is the right fix here. Here's why:

```ruby
  if options.has_key? 'image'
    image_name = options.delete 'image'
    # We don't know the owner of the image.
    image = images.create({:name => image_name})
    @image_url = @api_url + image.resource_url
    body_object['image'] = @image_url
  end
```

This is confusing because what it should be doing is call ```images.get``` in order to check if the image name is valid, and if the ```get``` call succeeds, we can proceed with using that image model to infer the ```image.resource_url``` (which is really the point of this whole exercise, iiuc). With this change, we will also need something similar to https://github.com/fog/fog/commit/9f2bd9b80bef65f4981b6f923a9eae4dc6d5f95d in order for the ```images.get``` to search both the globally-public and project image collections.

So changing ```bootstrap```  to use ```images.get``` is the right solution here, imho.

Please correct me if I'm missing something.