added error logging
Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop: (27 commits)
  Allow user to keep tmp files without code diving
  Fix #290 by allowing 0400 perms on a key
  There's no need to format the exception ourselves.
  Remove exit call since it was not there initially.
  Exit when there a failure in queries. Fixes #297.
  Get map data from the proper place, Refs #298. Additional fixes.
  The config file was not meant to be updated.
  Single quotes and don't redefine outer function.
  Define `avz` which is going to be overridden in `for` loop and used in a latter call.
  Re-add `sys` import.
  Remove duplicate log line. Re-add `sys` import.
  Remove unused imports.
  Some more unnecessary duplicate imports.
  Remove unused imports. PEP-8 formatting.
  Remove duplicate key.
  Full import.
  No need to duplicate imports.
  Fix PyLint C0103 on `saltcloud.clouds.aws` + PEP-8 + Unused imports.
  Add several more names which should be considered valid names.
  Fix PyLint C0103 on `saltcloud.utils.__init__` + PEP-8.
  ...
clean up wait_for_passwd a bit
change root_cmd a bit
a couple more changes
Finish that timeout thought
Merge pull request #318 from jesusaurus/debug/use_pass

Clean up some stuff in utils
Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop: (29 commits)
  Add misc.rst to the table of contents
  Add docs for delete_sshkeys
  Allow salt-cloud to remove ssh keys upon destroy()
  handle the rename of the bootstrap script
  Default enable_hard_maps to False
  --hard must be explicitly enbled
  Finish that timeout thought
  a couple more changes
  wildcard scripts/, update chglog
  change order to fix install paths
  change root_cmd a bit
  clean up wait_for_passwd a bit
  add cloud.d for issue #280
  Remove paramiko as a requirement
  Remove the last bit of paramiko from the code
  sshpass is now required
  Remove unnecessary ssh definition for paramiko
  Switch ssh.exec_command to root_cmd for ibmsce
  Switch ssh.exec_command to root_cmd (except for ibmsce)
  Remove unused sftp transport
  ...
updated all remaining os references to use new script option
Merge pull request #325 from seanchannel/develop

special case ubuntu/lucid daemon start
removed error log update
Merge pull request #326 from ydavid365/script-update

'Script' update. found a bunch of places where the old 'os' option was still around...
drop script: setting