Ec2 tags

Hey, this is the patch for ec2-tags support against master.