diff --git a/.gitignore b/.gitignore
index 3113235f96..5c986d1c57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,3 @@
 .cache
 vendor
-
-.DS_Store
-*.[568ao]
-*.ao
-*.so
-*.pyc
-._*
-.nfs.*
-[568a].out
-*~
-*.orig
-core
-_obj
-_test
-_testmain.go
-
-# Conformance test output and transient files.
-conformance/failing_tests.txt
+cmd/protoc-gen-go/protoc-gen-go
diff --git a/.travis.yml b/.travis.yml
index 0aec6a31bf..ae7591ac03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: xenial
 script:
   - ./test.bash
 cache: