PR add rake comments and ec2 cleanup task

Just noticed I'm doing a #collect here which will return nil if the tag isn't found.  That will invalid the next abort condition.