added postgresql gem and changed database.yml
Fixes Merge conflicts on master