Changes db engine to pg
Merged with master, resolves conflicts
Merge branch 'migrate-pg'