Prep for s3 deployment. Re: GH-58