fixed postgres to use template
Merge branch 'master' of github.com:meantheory/bearded-octo-archer