Fix a bug with payloads of type string.  Fixes https://github.com/aws/aws-cli/issues/236.
Updates to fix test failures.
Removing unneeded debug statements, fixed typo, fixed None check.
Merge branch 'fix-s3-put-bucket-policy' of git://github.com/garnaat/botocore into garnaat-fix-s3-put-bucket-policy