diff --git a/.gitignore b/.gitignore
index f004016a25..2a48495156 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 ### Zero to JupyterHub Kubernetes ###
-tools/lint-output/
+tools/templates/rendered-templates/
+bin/
+ci/.vagrant
 
+.vscode
 
 ### macOS ###
 *.DS_Store
diff --git a/.travis.yml b/.travis.yml
index 0965170c2a..615ca04c43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ install:
 - . ci/minikube.env
 - ./ci/install.sh
 script:
+- python3 tools/templates/lint-and-validate.py
 - chartpress --commit-range ${TRAVIS_COMMIT_RANGE}
 - git diff
 - ./ci/test.sh
@@ -21,7 +22,6 @@ deploy:
   on:
     branch:
     - master
-    - v0.7-dev
     condition: "$KUBE_VERSION = 1.9.4"
 env:
   matrix: