WIP commit.  Add a number of new options to s3 cp, mv, sync commands to specify SS3, website redirect, storage class, and additional HTTP headers.
Add --grants plus a few other options.
Fix issue with test on Python 2.6.
Changing headers to params and changing syntax to match shorthand syntax rather than modeling after HTTP headers.
Add possible choices for param name to help text.
Add unit test for --content-type parameter.
Resolving merge conflicts.
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Breaking out all of the params buried under --params into first-class options.
Adding a couple more params to test.
Fix the xmlns for the GetPasswordData response.
Merge branch 'develop' of git://github.com/garnaat/aws-cli into garnaat-develop
Merge branch 'fix-ec2-unit-test' of git://github.com/garnaat/aws-cli into garnaat-develop