fd88d147

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into sqlite-store-clock

# Conflicts:
#	cmd/app/main.go
#	cmd/import-from-tinybeans/main.go
#	store/sqlite/sessions_test.go
#	store/sqlite/sqlite.go
#	store/test_sqlite/db.go