Moved external storage settings.  Renamed any variables referencing s3.