612232c5

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into upload-to-s3

# Conflicts:
#	cmd/app/main.go
#	cmd/import-from-tinybeans/main.go
#	handlers/media_source.go
#	s3/s3.go
#	s3config/s3config.go