Fixed up some typos in s3put's help message
Resolving merge conflict.