Broke up settings into two files (base & local), added postgres