Added "options" parameter in AwsS3 Adapter

Closes #10.
Added "options" to the aws config example
Updated the aws tests
CS fix
Merge remote-tracking branch 'origin/1.0'