s/AWS_S3_BUCKET/AMAZON_S3_BUCKET/

Curses!
One extra line of output
Merge branch 'master' into link_to_new_user_preferences_113