Update for whirr-cm 1.1
Udpate for EC2 and whirr-cm 1.1