Add S3 bucket to AWS config template; tidied bucket_name method