Cleaning up old debug stuff
Merge pull request #361 from techhat/ec2

Cleaning up old debug stuff from ec2 module