Bugfix for my issue #303 - allows override of config file or EC2 IAM role
credentials with the command-line, fixes the issue where command-line
credentials were ignored if role credentials exist.
Merge pull request #304 from alertedsnake/alertedsnake_bugfix_303

Bugfix for #303