README.md in kitchen-ec2-0.10.0.rc.1 vs README.md in kitchen-ec2-0.10.0

@@ -10,11 +10,11 @@
 instances. Use Amazon's cloud for your infrastructure testing!
 
 ## Requirements
 
 There are **no** external system requirements for this driver. However you
-will need access to an [AWS][aws_site] account.
+will need access to an [AWS][aws_site] account.  [IAM][iam_site] users should have, at a minimum, permission to manage the lifecycle of an EC2 instance along with modifying components specified in kitchen driver configs.  Consider using a permissive managed IAM policy like ``arn:aws:iam::aws:policy/AmazonEC2FullAccess`` or tailor one specific to your security requirements.
 
 ## Installation and Setup
 
 Please read the [Driver usage][driver_usage] page for more details.
 
@@ -232,11 +232,11 @@
 
 ### http\_proxy
 
 Specify a proxy to send AWS requests through.  Should be of the format `http://<host>:<port>`.
 
-The default is `ENV['HTTP_PROXY']`
+The default is `ENV["HTTPS_PROXY"] || ENV["HTTP_PROXY"]`.  If you have these environment variables set and do not want to use a proxy when contacting aws set `http_proxy: nil`.
 
 **Note** - The AWS command line utility allow you to specify [two proxies](http://docs.aws.amazon.com/cli/latest/userguide/cli-http-proxy.html), one for HTTP and one for HTTPS.  The AWS Ruby SDK only allows you to specify 1 proxy and because all requests are `https://` this proxy needs to support HTTPS.
 
 ## Disk Configuration
 
@@ -270,19 +270,25 @@
     ebs_volume_type: gp2
     ebs_virtual_name: test
     ebs_volume_size: 15
     ebs_delete_on_termination: true
     ebs_snapshot_id: snap-0015d0bc
+  - ebs_device_name: /dev/sdc
+    ebs_volume_size: 100
+    ebs_delete_on_termination: true
+    ebs_volume_type: io1
+    ebs_iops: 100
 ```
 
 The keys `ebs_device_name`, `ebs_volume_size` and `ebs_delete_on_termination` are required for every mapping.
 For backwards compatiability a default `block_device_mappings` will be created if none are listed and the deprecated
 storage config keys are present.
 
 The keys `ebs_volume_type`, `ebs_virtual_name` and `ebs_snapshot_id` are optional.  See
 [Amazon EBS Volume Types](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html) to find out more about
-volume types. `ebs_volume_type` defaults to `standard` but can also be `gp2` or `io1`.
+volume types. `ebs_volume_type` defaults to `standard` but can also be `gp2` or `io1`.  If you specify `io1` you must
+also specify `ebs_iops`.
 
 If you have a block device mapping with a `ebs_device_name` equal to the root storage device name on your
 [image](#config-image-id) then the provided mapping will replace the settings in the image.
 
 If this is not provided it will use the default block_device_mappings from the AMI.
@@ -472,9 +478,10 @@
 [chef_omnibus_dl]:  http://www.getchef.com/chef/install/
 
 [amis_json]:        https://github.com/test-kitchen/kitchen-ec2/blob/master/data/amis.json
 [ami_docs]:         http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ComponentsAMIs.html
 [aws_site]:         http://aws.amazon.com/
+[iam_site]:         http://aws.amazon.com/iam
 [credentials_docs]: http://blogs.aws.amazon.com/security/post/Tx3D6U6WSFGOK2H/A-New-and-Standardized-Way-to-Manage-Credentials-in-the-AWS-SDKs
 [aws_sdk_gem]:      http://docs.aws.amazon.com/sdkforruby/api/index.html
 [group_docs]:       http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html
 [instance_docs]:    http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
 [key_id_docs]:      http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/verifying-your-key-pair.html