diff --git a/docs/admin/dns.md b/docs/admin/dns.md
index cc8972ef2c..407c439b73 100644
--- a/docs/admin/dns.md
+++ b/docs/admin/dns.md
@@ -1,8 +1,7 @@
 ---
 assignees:
-- ArtfulCoder
 - davidopp
-- lavalamp
+- thockin
 title: Using DNS Pods and Services
 ---
 
diff --git a/docs/admin/networking.md b/docs/admin/networking.md
index e1de39fdbd..08b3d1442e 100644
--- a/docs/admin/networking.md
+++ b/docs/admin/networking.md
@@ -1,6 +1,5 @@
 ---
 assignees:
-- lavalamp
 - thockin
 title: Networking in Kubernetes
 ---
diff --git a/docs/admin/node.md b/docs/admin/node.md
index cbb70229e7..0923169256 100644
--- a/docs/admin/node.md
+++ b/docs/admin/node.md
@@ -2,7 +2,6 @@
 assignees:
 - caesarxuchao
 - dchen1107
-- lavalamp
 title: Nodes
 ---
 
diff --git a/docs/admin/ovs-networking.md b/docs/admin/ovs-networking.md
index 9370dcec46..8ae71cc186 100644
--- a/docs/admin/ovs-networking.md
+++ b/docs/admin/ovs-networking.md
@@ -1,6 +1,5 @@
 ---
 assignees:
-- lavalamp
 - thockin
 title: Kubernetes OpenVSwitch GRE/VxLAN networking
 ---
diff --git a/docs/admin/salt.md b/docs/admin/salt.md
index ba4d4fe227..d2479ffff2 100644
--- a/docs/admin/salt.md
+++ b/docs/admin/salt.md
@@ -1,7 +1,6 @@
 ---
 assignees:
 - davidopp
-- lavalamp
 title: Configuring Kubernetes with Salt
 ---
 
diff --git a/docs/getting-started-guides/aws.md b/docs/getting-started-guides/aws.md
index 214cb00145..aabbe8a8bc 100644
--- a/docs/getting-started-guides/aws.md
+++ b/docs/getting-started-guides/aws.md
@@ -1,7 +1,6 @@
 ---
 assignees:
 - justinsb
-- lavalamp
 - clove
 title: Running Kubernetes on AWS EC2
 ---
diff --git a/docs/getting-started-guides/centos/centos_manual_config.md b/docs/getting-started-guides/centos/centos_manual_config.md
index 756aa4b248..f51aacf477 100644
--- a/docs/getting-started-guides/centos/centos_manual_config.md
+++ b/docs/getting-started-guides/centos/centos_manual_config.md
@@ -1,6 +1,5 @@
 ---
 assignees:
-- lavalamp
 - thockin
 title: CentOS
 ---
@@ -131,15 +130,17 @@ $ etcdctl mk /kube-centos/network/config "{ \"Network\": \"172.30.0.0/16\", \"Su
 * Configure flannel to overlay Docker network in /etc/sysconfig/flanneld on the master (also in the nodes as we'll see):
 
 ```shell
+# Flanneld configuration options
+
 # etcd url location.  Point this to the server where etcd runs
-FLANNEL_ETCD="http://centos-master:2379"
+FLANNEL_ETCD_ENDPOINTS="http://centos-master:2379"
 
 # etcd config key.  This is the configuration key that flannel queries
 # For address range assignment
-FLANNEL_ETCD_KEY="/kube-centos/network"
+FLANNEL_ETCD_PREFIX="/kube-centos/network"
 
 # Any additional options that you want to pass
-FLANNEL_OPTIONS=""
+#FLANNEL_OPTIONS=""
 ```
 
 * Start the appropriate services on master:
@@ -179,15 +180,17 @@ KUBELET_ARGS=""
 * Configure flannel to overlay Docker network in /etc/sysconfig/flanneld (in all the nodes)
 
 ```shell
+# Flanneld configuration options
+
 # etcd url location.  Point this to the server where etcd runs
-FLANNEL_ETCD="http://centos-master:2379"
+FLANNEL_ETCD_ENDPOINTS="http://centos-master:2379"
 
 # etcd config key.  This is the configuration key that flannel queries
 # For address range assignment
-FLANNEL_ETCD_KEY="/kube-centos/network"
+FLANNEL_ETCD_PREFIX="/kube-centos/network"
 
 # Any additional options that you want to pass
-FLANNEL_OPTIONS=""
+#FLANNEL_OPTIONS=""
 ```
 
 * Start the appropriate services on node (centos-minion-n).
diff --git a/docs/getting-started-guides/cloudstack.md b/docs/getting-started-guides/cloudstack.md
index 4dd542f127..19c292d1f3 100644
--- a/docs/getting-started-guides/cloudstack.md
+++ b/docs/getting-started-guides/cloudstack.md
@@ -1,6 +1,5 @@
 ---
 assignees:
-- lavalamp
 - thockin
 title: Cloudstack
 ---
diff --git a/docs/getting-started-guides/rkt/index.md b/docs/getting-started-guides/rkt/index.md
index 2e6a473370..7be07d857d 100644
--- a/docs/getting-started-guides/rkt/index.md
+++ b/docs/getting-started-guides/rkt/index.md
@@ -1,6 +1,5 @@
 ---
 assignees:
-- lavalamp
 - yifan-gu
 title: Running Kubernetes with rkt
 ---
diff --git a/docs/tasks/index.md b/docs/tasks/index.md
index 3215f0b026..2482a13677 100644
--- a/docs/tasks/index.md
+++ b/docs/tasks/index.md
@@ -16,6 +16,7 @@ single thing, typically by giving a short sequence of steps.
 * [Pulling an Image from a Private Registry](/docs/tasks/configure-pod-container/pull-image-private-registry/)
 * [Configuring Liveness and Readiness Probes](/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/)
 * [Communicating Between Pods Running in the Same Container](/docs/tasks/configure-pod-container/communicate-containers-same-pod/)
+* [Configuring Pod Initialization](/docs/tasks/configure-pod-container/configure-pod-initialization/)
 
 #### Accessing Applications in a Cluster
 
diff --git a/docs/user-guide/update-demo/index.md b/docs/user-guide/update-demo/index.md
index 3ecd743855..7f0952348c 100644
--- a/docs/user-guide/update-demo/index.md
+++ b/docs/user-guide/update-demo/index.md
@@ -1,6 +1,5 @@
 ---
 assignees:
-- lavalamp
 - mikedanese
 title: Rolling Update Demo
 ---