diff --git a/.codeclimate.yml b/.codeclimate.yml
index a831981..8ea405d 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,3 +1,5 @@
+version: "2"
+
 engines:
   fixme:
     enabled: true
diff --git a/.coveralls.yml b/.coveralls.yml
deleted file mode 100644
index 90ae313..0000000
--- a/.coveralls.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-service_name: travis-ci
-coverage_clover: build/logs/clover.xml
diff --git a/.editorconfig b/.editorconfig
index 85702a9..4517a93 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,19 +1,15 @@
-# editorconfig.org
 root = true
 
 [*]
+charset = utf-8
 end_of_line = lf
+indent_size = 4
 indent_style = space
-charset = utf-8
-trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = space
-
-[{src,tests}/**.{php,tpl}]
-indent_size = 4
+trim_trailing_whitespace = true
 
-[{*,!vendor/*}.json]
-indent_size = 4
+[*.md]
+trim_trailing_whitespace = false
 
-[{*,!vendor/*}.yml]
+[*.yml]
 indent_size = 2