diff --git a/.editorconfig b/.editorconfig
index 0ac22f0737d..28b11218608 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,3 +9,8 @@ trim_trailing_whitespace=true
 max_line_length=120
 insert_final_newline=true
 
+[.travis.yml]
+indent_style=space
+indent_size=2
+tab_width=8
+end_of_line=lf
diff --git a/.travis.yml b/.travis.yml
index 91a5dd5b91f..f3cbb4f4516 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,22 +44,22 @@ addons:
 script:
   - if [ "$RUN_TESTS" = "true" ]; then ./test.sh; fi
 
-install:
-  - [ "$RUN_COVERAGE" = "true" ] &&
-	wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
-	tar xzf master.tar.gz &&
-	mkdir kcov-master/build &&
-	cd kcov-master/build &&
-	cmake .. &&
-	make && make install DESTDIR=../tmp &&
-	cd ../..
+install: |
+  [ "$RUN_COVERAGE" = "true" ] &&
+  wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
+  tar xzf master.tar.gz &&
+  mkdir kcov-master/build &&
+  cd kcov-master/build &&
+  cmake .. &&
+  make && make install DESTDIR=../tmp &&
+  cd ../..
 
 after_success:
-	- [ "$RUN_COVERAGE" = "true" ] && ./scripts/cov.sh "$KCOV_CMD"
-	- [ $TRAVIS_BRANCH = master ] &&
-	  [ $TRAVIS_PULL_REQUEST = false ] &&
-	  [ $TRAVIS_RUST_VERSION = stable ] &&
-	  ./scripts/doc.sh &&
-	  pip install --user ghp-import &&
-	  /home/travis/.local/bin/ghp-import -n target/doc &&
-	  git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
+  - true && [ "$RUN_COVERAGE" = "true" ] && ./scripts/cov.sh "$KCOV_CMD"
+  - true && [ $TRAVIS_BRANCH = master ] &&
+    [ $TRAVIS_PULL_REQUEST = false ] &&
+    [ $TRAVIS_RUST_VERSION = stable ] &&
+    ./scripts/doc.sh &&
+    pip install --user ghp-import &&
+    /home/travis/.local/bin/ghp-import -n target/doc &&
+    git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages