Updated scripts for Postgresql.
Pulled changes on upstream repo.
Deleted file with merge conflicts.
Merge remote-tracking branch 'upstream/master'
Merge pull request #13 from rweekers/master

Pull changes