Merge pull request #134 from mikebrow/goversionupdate

Putting in the go versions we want to test against

.travis.yml

@@ -1,6 +1,4 @@
 language: go
-go:
-    - 1.8
 
 sudo: required
 
@@ -23,18 +21,30 @@ before_script:
 
 jobs:
   include:
-    - stage: Build
+    - stage: Verify
       script:
         - make install.tools
         - make .gitvalidation
         - make verify
-        - make binaries
+      go: 1.8.x
-    - stage: Test
+    - script:
+        - make install.tools
+        - make .gitvalidation
+        - make verify
+      go: tip
+    - stage: Build and Test
       script:
         - make install.deps
         - make test
         - make binaries
         - make test-cri
+      go: 1.8.x
+    - script:
+        - make install.deps
+        - make test
+        - make binaries
+        - make test-cri
+      go: tip
 
 after_script:
     # Abuse travis to preserve the log.