By: Michael Lynch <git@mtlynch.io>
Merge branch 's3-env' of /home/mike/code/little-moments-a into s3-env