diff --git a/.travis.yml b/.travis.yml
index 691d897659..6d889f3c23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 go:
-  - 1.7.3
+  - 1.8.1
 
 # Don't want default ./... here:
 install:
@@ -11,23 +11,9 @@ install:
 # (1) Fetch dependencies for us to run the tests in test/examples_test.go
 - go get -t -v k8s.io/kubernetes.github.io/test
 
-# The dependencies are complicated for test/examples_test.go
-# k8s.io/kubernetes/pkg is a dependency, which in turn depends on apimachinery
-# but we also have apimachinery directly as one of our dependencies, which causes a conflict.
-# Additionally, we get symlinks when we clone the directory. The below steps do the following:
-
-# (a) Replace the symlink with the actual dependencies from kubernetes/staging/src/
-# (b) copy all the vendored files to $GOPATH/src
-- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apimachinery
-- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apiserver
-- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/client-go
-- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/sample-apiserver
-- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/kube-aggregator
-- cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/
-- rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/*
-- cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/
-- cp -r $GOPATH/src/k8s.io/apimachinery/vendor/* $GOPATH/src/
-- rm -rf $GOPATH/src/k8s.io/apimachinery/vendor/*
+# Simplified deduplication of dependencies.
+- cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/
+- rm -r $GOPATH/src/k8s.io/kubernetes/vendor/
 
 # (2) Fetch md-check along with all its dependencies.
 - git clone --depth=50 --branch=master https://github.com/kubernetes/md-check $HOME/gopath/src/k8s.io/md-check
diff --git a/_config.yml b/_config.yml
index 60e67c9cde..6536b1a6f1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -36,6 +36,8 @@ gems:
   - jekyll-seo-tag
   - jekyll-include-cache
 
+include: [_headers]
+
 # SEO
 logo: /images/favicon.png
 twitter:
diff --git a/_headers b/_headers
new file mode 100644
index 0000000000..c45a1be425
--- /dev/null
+++ b/_headers
@@ -0,0 +1,3 @@
+# Prevent bots from indexing site
+/*
+  X-Robots-Tag: noindex
diff --git a/skip_title_check.txt b/skip_title_check.txt
index 90ac6482c5..a3218e6b03 100644
--- a/skip_title_check.txt
+++ b/skip_title_check.txt
@@ -9,4 +9,7 @@ docs/api-reference/v1/definitions.md
 docs/api-reference/v1/operations.md
 docs/user-guide/pods/_viewing-a-pod.md
 docs/user-guide/simple-yaml.md
-docs/concepts/abstractions/pod-termination.md
\ No newline at end of file
+docs/concepts/abstractions/pod-termination.md
+docs/api-reference/README.md
+docs/user-guide/logging/stackdriver.md
+docs/user-guide/production-pods.md
diff --git a/skip_toc_check.txt b/skip_toc_check.txt
index 7299c12c1f..744d432c92 100644
--- a/skip_toc_check.txt
+++ b/skip_toc_check.txt
@@ -16,3 +16,6 @@ docs/user-guide/downward-api/index.md
 docs/user-guide/downward-api/volume/index.md
 docs/user-guide/getting-into-containers.md
 
+docs/api-reference/README.md
+docs/user-guide/logging/stackdriver.md
+docs/user-guide/production-pods.md