[rackspace|compute_v2] fixing broken test
Merge branch 'master' of github.com:fog/fog into auth20
[rackspace|identity] updated test to support ruby 1.8.7
Merge pull request #1581 from bvox/quantum-network-attributes

[openstack|network] Added missing Network model attributes
[rackspace] updated service_catalog.reload; added rackspace_cdn_url as an option to storage service; tweaked compute_v2 auth
Merge branch 'master' of github.com:fog/fog into auth20
joyent resize smartmachine incorrect class type
Merge pull request #1585 from angusscown/joyent_resize_bug

joyent resize smartmachine incorrect class type
Merge pull request #1567 from rackspace/bootstrap_note

[Rackspace|Compute_v2] Added note about bootstrap method and RackConnect
Merge pull request #1576 from rackspace/mock_blues

[rackspace|compute] updated mocking framework to support any flavor or image
Merge pull request #1563 from rackspace/dir_metadata

[Rackspace|Storage] Added support for container metadata
supported OpenStack Quantum Router Operation. not include mock code.
added mock code for router operation.
fixed responce data from mock and removed vanilla options reject code.
Merge branch 'master' into file_metadata
rebasing cdn branch with latest master
Merge branch 'master' of github.com:fog/fog into storage_account
fix for user agent tests excon usage
Merge branch 'master' of github.com:fog/fog into auth20
[rackspace|compute] remove erroneous block argument to get_object
fixes #1588