Formatting flavor data and updating documentation to include i2 instances.
Renaming ebs_optimized -> ebs_optimized_available
Removing unnecessary comments.
Merge pull request #2605 from davissp14/master

Flag AWS EBS-Optimized Instances
[aws] align hashrockets, remove whitespace
Merge pull request #2611 from estonfer/hashrocket_fix

[aws] align hashrockets, remove whitespace
There is a bug here or maybe i'm using the gem wrong...
Edit
you should merge the ACLs after merging the meta_has if not The new permission will be overwritten by the old one.
If Before you had a directory with :
X-Container-Read: .r:*,.rlistings

and you make your directory private again. The new read_acl will be overwritten by the old one in the mata_hash
[Brightbox] Sort schema collections
Merge pull request #2613 from sulphur/master

There is a bug here or maybe i'm using the gem wrong...
[Brightbox] Add CloudIp#destination_id

Abstraction over the number of possible mapped targets to consistently
access the identifier.
Merge pull request #2614 from brightbox/brightbox_updates

[Brightbox] Add CloudIp#destination_id
merge upstream changes