Changes for EC2 integration
Merge pull request #1 from HBOCodeLabs/sushi/changes-for-ec2-integration

Changes for EC2 integration