Move the s3cmd setup into bootstrap so present even if testing.