Various AWS fixes
Rewrite and unify bootstrap scripts
Merge pull request #1 from bardo/master

Various AWS fixes and shell updates