Merge pull request #8 from areagray/master

S3 prep