By: Michael Lynch <git@mtlynch.io>
Merge branch 'master' into upload-to-s3 # Conflicts: # handlers/routes.go