Merge branch 'master' into download_kubectl

_data/guides.yml

@@ -1,8 +1,8 @@
 bigheader: "Guides"
-abstract: "How to get started, and achieve tasks, using Kubernetes"
+abstract: "How to get started, and accomplish tasks, using Kubernetes."
 toc:
 - title: Guides
-  path: /docs/
+  path: /docs/user-guide/
 
 - title: Getting Started
   section:
@@ -10,6 +10,8 @@ toc:
     path: /docs/whatisk8s/
   - title: Installing Kubernetes on Linux with kubeadm
     path: /docs/getting-started-guides/kubeadm/
+  - title: Installing Kubernetes on AWS with kops
+    path: /docs/getting-started-guides/kops/
   - title: Hello World on Google Container Engine
     path: /docs/hellonode/
   - title: Installing kubectl
@@ -70,6 +72,8 @@ toc:
       path: /docs/getting-started-guides/network-policy/walkthrough/
     - title: Using Calico for NetworkPolicy 
       path: /docs/getting-started-guides/network-policy/calico/
+    - title: Using Romana for NetworkPolicy 
+      path: /docs/getting-started-guides/network-policy/romana/
 
 - title: Batch Jobs
   section: