new ubuntu amis
Merge pull request #331 from s0undt3ch/develop

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

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

fix URL appearances
make distro links work
Merge pull request #333 from seanchannel/develop

make distro links work
Merge pull request #334 from s0undt3ch/develop

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

Only instantiate the deploy script if actually deploying, ie, `--no-deploy` is not used.
Merge pull request #336 from s0undt3ch/develop

Let users know that a map is being applied.
Fix `AttributeError` introduced with latest config loading changes.

We now store a temporary configuration dictionary with just the cloud settings so that the logging level can be retrieved in `salt.utils.parsers.LogLevelMixIn.process_log_level()`.