diff --git a/.travis.yml b/.travis.yml
index 61caa32130..c6eae50ced 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,21 @@
 language: go
 go:
-  - 1.6.2
+  - 1.8.1
 
 # Don't want default ./... here:
 install:
 - export PATH=$GOPATH/bin:$PATH
 - mkdir -p $HOME/gopath/src/k8s.io
 - mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/kubernetes.github.io
+
+# (1) Fetch dependencies for us to run the tests in test/examples_test.go
 - go get -t -v k8s.io/kubernetes.github.io/test
+
+# 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
 - go get -t -v k8s.io/md-check
 
diff --git a/_config.yml b/_config.yml
index 5b7f442fd8..aaf4e0ee23 100644
--- a/_config.yml
+++ b/_config.yml
@@ -30,3 +30,5 @@ permalink: pretty
 
 gems:
   - jekyll-redirect-from
+
+include: [_headers]
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