7a620b53

By: Michael Lynch <git@mtlynch.io>

Merge branch 'master' into sqlite

# Conflicts:
#	handlers/db_dev.go
#	store/memory/memory.go
#	tinybeans/jsonfile/jsonfile.go