diff --git a/.editorconfig b/.editorconfig
index 4b8b3e1..fb0704d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,8 +2,20 @@ root = true
 
 [*]
 end_of_line = lf
-insert_final_newline = true
 charset = utf-8
+insert_final_newline = true
 indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = true
+
+[*.{js,jsx,ts,tsx,html,php,vim,toml,yml,json}]
+indent_size = 2
+
+[*.yml]
+indent_style = space
+
+[Makefile,*.go]
+indent_style = tab
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.travis.yml b/.travis.yml
index 9c810f2..f58d58d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,27 +3,27 @@ language: rust
 cache: cargo
 
 git:
-	depth: 1
+  depth: 1
 
 matrix:
-	include:
-		- env: TARGET=x86_64-unknown-linux-gnu
-			os: linux
+  include:
+    - env: TARGET=x86_64-unknown-linux-gnu
+      os: linux
 
 install: true
 script: ./ci/script.sh
 
 deploy:
-	provider: releases
-	api_key: $GITHUB_TOKEN
-	file_glob: true
-	file: "./*.tar.gz"
-	skip_cleanup: true
-	on:
-		tags: true
+  provider: releases
+  api_key: $GITHUB_TOKEN
+  file_glob: true
+  file: "./*.tar.gz"
+  skip_cleanup: true
+  on:
+    tags: true
 
 if: tag IS present
 
 notifications:
-	email:
-		on_success: never
+  email:
+    on_success: never