Changed AWS YML config to use keywords.
Merge branch 'master' into staging