Merge pull request #300 from s0undt3ch/develop

Some more fixes.
Fix #290 by allowing 0400 perms on a key
Allow user to keep tmp files without code diving
Merge pull request #301 from techhat/issue290

Fix #290 by allowing 0400 perms on a key
Merge pull request #302 from techhat/keeptmp

Allow user to keep tmp files without code diving
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.
  ...
Adding botocore to requirements.txt
Merge pull request #304 from techhat/botocore

Adding botocore to requirements.txt
Allow script_args to be passed to deploy.sh
require boto for issue #303
Merge pull request #305 from techhat/scriptargs

Allow script_args to be passed to deploy.sh
Better checking for key dirs
Resolve error with missing script_args
Merge pull request #308 from techhat/scriptargs

Resolve error with missing script_args
Merge pull request #307 from techhat/issue298

Better checking for key dirs
Sudo is being prepended later if needed.

If sudo is needed, it can be set in the cloud profile.  If it is
set there, then we end up with 'sudo sudo /tmp/deploy.sh', which
just looks ugly.
Merge pull request #313 from jesusaurus/sudosudo

Sudo is being prepended later if needed.
Switching sftp from paramiko to sshpass+scp
Technically using scp, change things accordingly