Bugfix for #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.

Fixes #303 - I'm not sure if this is the ideal fix or the preferred way, but it does the job.