diff --git a/.editorconfig b/.editorconfig
index 982d1d6e..6cfb4760 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,13 +10,14 @@ indent_style = space
 [*.{cs,csx,vb,vbx}] 
 indent_size = 4 
 insert_final_newline = true 
+trim_trailing_whitespace = true
 charset = utf-8-bom 
+[*.{json,yml,xml}]
+indent_size = 2
 ############################### 
 # .NET Coding Conventions     # 
 ############################### 
 [*.{cs,vb}] 
-# Unix-style newlines with a newline ending every file
-end_of_line = lf
 # Organize usings 
 dotnet_sort_system_directives_first = false 
 # this. preferences 
diff --git a/.gitattributes b/.gitattributes
index 316eaeef..a1e1e97a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,7 +11,6 @@
 # Note: This is only used by command line
 ###############################################################################
 #*.cs     diff=csharp
-*.sln text eof=crlf
 
 ###############################################################################
 # Set the merge driver for project and solution files