Change AWS env variables to their canonical name (thx Zvi)
Merge pull request #100 from cstar/master

Change AWS env variables to their canonical name