Use top-level postgres.port and existing states to set port

pillar.example

@@ -1,3 +1,7 @@
+# Port to use for the cluster -- can be used to provide a non-standard port
+# NOTE: If already set in the minion config, that value takes priority
+postgres.port: '5432'
+
 postgres:
   # UPSTREAM REPO
   # Set True to configure upstream postgresql.org repository for YUM/APT/ZYPP
@@ -32,13 +36,9 @@ postgres:
     hard: 64000
 
   # POSTGRES
-  # Non-standard port to use for the cluster
-  # Only set if port `5432` is not appropriate
-  port: 5433
-
   # Append the lines under this item to your postgresql.conf file.
   # Pay attention to indent exactly with 4 spaces for all lines.
-  postgresconf: |
+  postgresconf: |-
     listen_addresses = '*'  # listen on all interfaces
 
   # Path to the `pg_hba.conf` file Jinja template on Salt Fileserver