Add support for the S3 plugin
cleanup and added storage class and region options
Merge branch 's3'