diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..57b9f47
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.go]
+indent_style = tab
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.travis.yml b/.travis.yml
index 0eb66ff..3070394 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,16 @@
 language: go
 
 go:
-    - 1.7.5
-    - 1.8.1
-    - tip
+  - 1.7.5
+  - 1.8.1
+  - tip
 
 install:
-    - go get github.com/axw/gocov/gocov
-    - go get github.com/mattn/goveralls
-    - go get golang.org/x/tools/cmd/cover
+  - go get github.com/axw/gocov/gocov
+  - go get github.com/mattn/goveralls
+  - go get golang.org/x/tools/cmd/cover
 
 script:
-    - go vet $(go list ./... | grep -v '/vendor/')
-    - go test -v -race $(go list ./... | grep -v '/vendor/')
-    - goveralls -package=github.com/Castcloud/castcloud-go-server/api -service=travis-ci
+  - go vet $(go list ./... | grep -v '/vendor/')
+  - go test -v -race $(go list ./... | grep -v '/vendor/')
+  - goveralls -package=github.com/Castcloud/castcloud-go-server/api -service=travis-ci