hope this works
Merge branch 'master' of https://github.com/modern-media/wp-aws-s3