ec2_vol improvements

/cc @lwade