Fixing ec2 swarming
Merge http://github.com/chetan51/pilot