Parse any return values located in headers and place in response data.  Fixes https://github.com/aws/aws-cli/issues/244
Merge branch 'fix-s3-headers' of git://github.com/garnaat/botocore into garnaat-fix-s3-headers