Move s3cmd requirement back to appropriate place