7ee41c84

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into slice-3.1

# Conflicts:
#	handlers/upload.go
#	handlers/upload_test.go
#	importers/tinybeans/convert_test.go
#	store/sqlite/migrations/001-initial-tables.sql