Friendly image plugin now uses s3 upload class