Cleanup of PSQL setup and git-crypt 4.0