Merge branch 'develop'
add key_data to ec2 gateway
override_tags default to empty hash
Merge branch 'master' into develop