added aws globals
Merge remote-tracking branch 'origin/jake' into Alex