New keter config file format
Merge branch 'postgres' into postgres-fay