testing aws settings
Merge remote-tracking branch 'origin/jb_cookbooks' into jb_cookbooks