Add diverged PRs back in

.travis.yml

@@ -0,0 +1,12 @@
+language: go
+
+sudo: false
+
+go:
+  - 1.4
+  - 1.5
+  - 1.6
+  - tip
+
+script:
+  - go test -bench . -benchmem -v ./...

uuid_test.go

@@ -49,3 +49,9 @@ func TestParseUUID(t *testing.T) {
 		t.Fatalf("mismatched buffers")
 	}
 }
+
+func BenchmarkGenerateUUID(b *testing.B) {
+	for n := 0; n < b.N; n++ {
+		_, _ = GenerateUUID()
+	}
+}