First stab at PostgreSQL
Merge branch 'postgresql'