Add ph's pull request for IAM Roles pretty please

This is a merge of head with pull request #1 to make it easier to add to head.