[rackspace] fixing more live tests
[aws|cloudwatch] remove :host key from request
[OS|Volume] Add listing/showing volume types
Merge pull request #2349 from burns/aws_cloudwatch_host_param

[aws|cloudwatch] remove :host key from request
Merge pull request #2343 from grk/openstack-volume-types

[OS|Volume] Add listing/showing volume types
Merge branch 'master' of github.com:fog/fog into test_fix6
Allows custom username for aws spot instances
Merge pull request #2354 from rackspace/test_fix6

[rackspace] fixing broken tests
Merge pull request #2355 from kcen/master

Allows custom username for aws spot instances
Auto-merge remote-tracking branch 'upstream/master'