S3: Added cache-control and expires options. Fixes #138
Merge pull request #140 from Joshua-Anderson/s3-cache-control

S3: Added cache-control and expires options.