Switch to new style map.jinja

Move this formula to the new style map.jinja. Still need to sort out RedHat
handling, but it's not any worse than it was before (i.e. horribly broken)

postgres/upstream.sls

@@ -1,11 +1,14 @@
 {% from "postgres/map.jinja" import postgres with context %}
 
-{% if grains['os'] == 'Ubuntu' %} # Other distro support should be added here
+{% if grains['os_family'] == 'Debian' %}
 install-postgresql-repo:
   pkgrepo.managed:
     - humanname: PostgreSQL Official Repository
-    - name: {{ postgres.pkg_repo }}
+    - name: {{ postgres.pkg_repo }} {{ postgres.version }}
     - keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
     - keyserver: keyserver.ubuntu.com
     - file: {{ postgres.pkg_repo_file }}
+    - require_in:
+      - pkg: {{ postgres.pkg }}
 {% endif %}
+