Minor whitespace fixups
Merge branch 'master' of ssh://github.com/s3tools/s3cmd
Don't require 'json' - disable IAM when not available