aws setup
Merge branch 'aws'