In trying to fix the AWS CLI issue I started getting:

    File "/Users/garnaat/projects/mitch/botocore/botocore/parameters.py", line 82, in store_value_query
    built_params[label] = str(value)
    UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-2: ordinal not in range(128)

But actually just changing ``str`` to ``six.text_type`` fixes this.  I'll update.