Add AWS config
Merge branch 'aws' into spiracle