diff --git a/cluster/saltbase/salt/apiserver/init.sls b/cluster/saltbase/salt/apiserver/init.sls
index 3df3b4271ba..4fac05257bb 100644
--- a/cluster/saltbase/salt/apiserver/init.sls
+++ b/cluster/saltbase/salt/apiserver/init.sls
@@ -51,14 +51,14 @@ apiserver-third-party-go:
     - mode: 644
 
 apiserver-build:
-  cmd.wait:
+  cmd.run:
     - cwd: {{ root }}
     - names:
       - go build {{ package }}/cmd/apiserver
     - env:
       - PATH: {{ grains['path'] }}:/usr/local/bin
       - GOPATH: {{ root }}
-    - watch:
+    - require:
       - file: {{ package_dir }}
 
 /usr/local/bin/apiserver:
diff --git a/cluster/saltbase/salt/controller-manager/init.sls b/cluster/saltbase/salt/controller-manager/init.sls
index d38d5598e85..faf8a9d3898 100644
--- a/cluster/saltbase/salt/controller-manager/init.sls
+++ b/cluster/saltbase/salt/controller-manager/init.sls
@@ -51,14 +51,14 @@ controller-manager-third-party-go:
     - mode: 644
 
 controller-manager-build:
-  cmd.wait:
+  cmd.run:
     - cwd: {{ root }}
     - names:
       - go build {{ package }}/cmd/controller-manager
     - env:
       - PATH: {{ grains['path'] }}:/usr/local/bin
       - GOPATH: {{ root }}
-    - watch:
+    - require:
       - file: {{ package_dir }}
 
 /usr/local/bin/controller-manager:
diff --git a/cluster/saltbase/salt/kube-proxy/init.sls b/cluster/saltbase/salt/kube-proxy/init.sls
index 228e32c099c..c61034291d9 100644
--- a/cluster/saltbase/salt/kube-proxy/init.sls
+++ b/cluster/saltbase/salt/kube-proxy/init.sls
@@ -43,14 +43,14 @@ third-party-go:
       - mode
 
 kube-proxy-build:
-  cmd.wait:
+  cmd.run:
     - cwd: {{ root }}
     - names:
       - go build {{ package }}/cmd/proxy
     - env:
       - PATH: {{ grains['path'] }}:/usr/local/bin
       - GOPATH: {{ root }}
-    - watch:
+    - require:
       - file: {{ package_dir }}
 
 /usr/local/bin/kube-proxy:
diff --git a/cluster/saltbase/salt/kubelet/init.sls b/cluster/saltbase/salt/kubelet/init.sls
index ca48be9cd12..9d680063217 100644
--- a/cluster/saltbase/salt/kubelet/init.sls
+++ b/cluster/saltbase/salt/kubelet/init.sls
@@ -51,14 +51,14 @@ kubelet-third-party-go:
     - mode: 644
 
 kubelet-build:
-  cmd.wait:
+  cmd.run:
     - cwd: {{ root }}
     - names:
       - go build {{ package }}/cmd/kubelet
     - env:
       - PATH: {{ grains['path'] }}:/usr/local/bin
       - GOPATH: {{ root }}
-    - watch:
+    - require:
       - file: {{ package_dir }}
 
 /usr/local/bin/kubelet:
diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh
index dd1e7dc25b0..5062e6a2e37 100755
--- a/cluster/vagrant/provision-master.sh
+++ b/cluster/vagrant/provision-master.sh
@@ -47,6 +47,12 @@ reactor:
     - /srv/reactor/start.sls
 EOF
 
+  cat <<EOF >/etc/salt/master.d/salt-output.conf
+# Minimize the amount of output to terminal
+state_verbose: False
+state_output: mixed  
+EOF
+
   # Install Salt
   #
   # We specify -X to avoid a race condition that can cause minion failure to