Detect whether we run on EC2 using ec2-metadata as well
Merge pull request #419 from shivaram/ec2-ip-change

Detect whether we run on EC2 using ec2-metadata as well