diff --git a/.editorconfig b/.editorconfig
index 0e0a5db..7564632 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,11 +1,14 @@
 root = true
 
 [*]
-indent_style = tab
-indent_size = 2
-charset = utf-8
-trim_trailing_whitespace = true
+end_of_line = lf
 insert_final_newline = true
+charset = utf-8
+indent_size = 4
+trim_trailing_whitespace = true
 
-[{package.json,.travis.yml}]
+[*.{js,json}]
 indent_style = space
+
+[{package.json,package-lock.json}]
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..f8b1024
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,20 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly specify line endings for as many files as possible.
+# People who (for example) rsync between Windows and Linux need this.
+
+# File types which we know are binary
+
+# Prefer LF for most file types
+*.js text eol=lf
+*.json text eol=lf
+*.md text eol=lf
+
+# Prefer LF for these files
+.editorconfig text eol=lf
+.gitattributes text eol=lf
+.gitignore text eol=lf
+LICENSE text eol=lf
+
+# Use CRLF for Windows-specific file types