Merge pull request #263 from ydavid365/develop

updated ubuntu and ubuntu-git deploy scripts. hands-free on 12.04-1
Add list of AMI lists
Merge pull request #264 from techhat/aws

Add list of AMI lists
Inform the user when an action was attempted with a non-existant machine
Enable updating salt-bootstrap from salt-cloud
Merge pull request #265 from techhat/issue228

Inform the user when an action was attempted with a non-existent machine
Merge pull request #266 from techhat/issue247

Enable updating salt-bootstrap from salt-cloud
longname for update_salt_bootstrap function changed to update_bootstrap