Merge pull request #399 from tzz/master

aws_ec2: support block_device_mapping
cf-sketch.pl: add standalone_inputs runfile subkey