Switching to pgsql, much commented out (WIP)
Merge branch 'master' of https://github.com/rtoal/cher-ami into pgsql