Restore the AWS storage configuration code
Merge pull request #19 from droom/fix/recover_lost_changes

Restore the AWS storage configuration code