make postgres actually work out of the box in 0.6.x
Merge pull request #968 from metamx/fix-psql

Make postgres actually work out of the box in 0.6.x