Cleanup AWS
Merge branch 'master' of https://github.com/phamtec/skweltch