`rails new . --database=postgresql --skip-test-unit`, and some merging