fixed bad parameter name in AWS
Merge pull request #327 from jbadigital/timeout-bug

fixed bad parameter name in AWS
Fix os argument, add delete_sshkeys
added termination protection toggle using botocore
wrapped destroy method with check for termination protection
Merge pull request #278 from jbadigital/botocore

Termination protection enhancement
removed late import. botocore now imported in module scope
use libcloud to get EC2 instance_id, not salt ec2_info grain
fixed bug in AWS destroy wrapper
added termination protection usage comments
Merge pull request #329 from jbadigital/botocore-extras

Botocore extras
Allow specifying the master and profiles configuration files from withing the cloud one.
Merge pull request #331 from s0undt3ch/develop

Allow specifying the master and profiles configuration files from withing the cloud one.
Merge pull request #330 from seanchannel/develop

new ubuntu amis
Merge pull request #332 from seanchannel/develop

fix URL appearances
Merge pull request #333 from seanchannel/develop

make distro links work
Allow `--map` to be provided as a config key in the cloud's config file.
Merge pull request #334 from s0undt3ch/develop

Allow `--map` to be provided as a config key in the cloud's config file.
Only instantiate the deploy script if actually deploying, ie, `--no-deploy` is not used.
Merge pull request #335 from s0undt3ch/develop

Only instantiate the deploy script if actually deploying, ie, `--no-deploy` is not used.