longname for update_salt_bootstrap function changed to update_bootstrap
Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop:
  add_tags becomes set_tags, add del_tags
  Add tags to aws instance
  Allow kwargs for --action
  Add the ability to retrieve tags for an aws instance
Merge pull request #272 from jbadigital/tags

More multi-region and tags
Add rename to aws
Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop:
  correctly print tags of a renamed node after set_tags
  support multi-region in extended AWS functions
updated command-line longname
Adding usage info to the docstring for rename
Merge pull request #274 from techhat/issue273

Add rename to aws
Merge pull request #270 from ydavid365/develop

longname for update_salt_bootstrap function changed to update_bootstrap
Set deploy_script() to drop any master configs on the remote machine
Add master config-building function
Generate keys for the master, if needed
Let AWS lay down the master config files
revert to direct repo setup
add shifting-sands comment
Merge pull request #277 from seanchannel/develop

universal repo setup
Pass through -m option to salt-bootstrap
Merge pull request #276 from techhat/issue204

Lay down master config files on the minion
added termination protection toggle using botocore
wrapped destroy method with check for termination protection