Merge pull request #393 from tzz/master

Fixes for S3 deployments and README.include
Merge pull request #394 from tzz/master

simpleapplication-deploy and triggers
aws_ec2: support block_device_mapping