Fix escaping of URI's containing special characters

Allow for buckets & keys to have slashes in them.