Clean up s3 stuff, and gitignore.