Add local :database-url if postgres dependency
Tidy up files with custom template syntax