diff --git a/pillar.example b/pillar.example
index e69de29..b722cce 100644
--- a/pillar.example
+++ b/pillar.example
@@ -0,0 +1,12 @@
+salt:
+  master:
+    fileserver_backend:
+      - git
+      - roots
+    gitfs_remotes:
+      - git://github.com/saltstack-formulas/salt-formula.git
+    file_roots:
+      - base:
+        - /srv/salt
+  minion:
+    master: salt
diff --git a/salt/files/master b/salt/files/master
index 01ec49c..f295e8e 100644
--- a/salt/files/master
+++ b/salt/files/master
@@ -488,12 +488,12 @@ log_level_logfile: {{ salt.get('log_level_logfile', 'warning') }}
 # The date and time format used in log messages. Allowed date/time formating
 # can be seen here: http://docs.python.org/library/time.html#time.strftime
 #log_datefmt: '%H:%M:%S'
-log_datefmt_logfile: {{ salt.get('log_datefmt_logfile', '%Y-%m-%d %H:%M:%S') }}
+log_datefmt_logfile: '{{ salt.get('log_datefmt_logfile', '%Y-%m-%d %H:%M:%S') }}'
 
 # The format of the console logging messages. Allowed formatting options can
 # be seen here: http://docs.python.org/library/logging.html#logrecord-attributes
 #log_fmt_console: '[%(levelname)-8s] %(message)s'
-log_fmt_logfile: {{ salt.get('log_fmt_logfile', '%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s')}}
+log_fmt_logfile: '{{ salt.get('log_fmt_logfile', '%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s')}}'
 
 # This can be used to control logging levels more specificically.  This
 # example sets the main salt library at the 'warning' level, but sets
diff --git a/salt/master.sls b/salt/master.sls
index bcb404d..f4fb679 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -1,7 +1,7 @@
 salt-master:
   pkg.installed:
     {% if grains['os_family'] in ['RedHat', 'Debian'] %}
-    - name: salt-minion
+    - name: salt-master
     {% else %}
     - name: salt
     {% endif %}
@@ -11,30 +11,6 @@ salt-master:
     - source: salt://salt/files/master
   service.running:
     - enable: True
-    - require:
-      - pkg: salt-minion
     - watch:
-      - file: salt-minion
-
-configure-salt-master:
-  file.managed:
-    - name: /etc/salt/master
-    - source: salt://salt/templates/master.template
-    - template: jinja
-    - user: root
-    - groupt: root
-    - mode: 0700
-
-run-salt-master:
-  cmd.wait:
-    - name: start salt-master
-    - watch:
-      - file: run-salt-master
-    - require:
-      - file: configure-salt-master
-  file.managed:
-    - name: /etc/init/salt-master
-    - source: salt://salt/templates/upstart-master.conf
-    - template: jinja
-    - defaults:
-        run_mode: master
+      - pkg: salt-master
+      - file: salt-master