implementing latest updates

Implementing updates from latest version of extravert's amazons3 plugin