hack on the url encode to make sure s3 upload will go through, a better URL encode method needed
Merge pull request #2 from xren/master

Hack on the url encode to make sure s3 upload will go though