Add S3 Support, changing the API a bit.

Align the parameters of a method call if they span more than one line.