Revert "Merge branch 'postgres'"

This reverts commit 886d93be74de45247c86bbe0f9084cf2927652ca, reversing
changes made to d2627ae293b7cdabe4bde03621178e7120694500.
Revert "Revert "Merge branch 'postgres'""

This reverts commit e02abd485400918ff3f8a389081d584a8d5e2f64.
Re-enable sqlite3 in dev
Merge branch 'layoutstuffs'