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 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
Merge pull request #270 from ydavid365/develop

longname for update_salt_bootstrap function changed to update_bootstrap