diff --git a/.gitattributes b/.gitattributes
index 67d83c596..f3760d287 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,8 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 
+builds/* -text
+
 # Custom for Visual Studio
 *.cs     diff=csharp
 *.sln    merge=union
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index c39683cb6..e03c9f494 100755
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -2,7 +2,7 @@ module.exports = (grunt) ->
   grunt.util.linefeed = '\n'
 
   importHTML = (filename) ->
-    "(innerHTML: #{JSON.stringify grunt.file.read("src/General/html/#{filename}.html").replace(/^\s+|\s+$</gm, '').replace(/\n/g, '')})"
+    "(innerHTML: #{JSON.stringify grunt.file.read("src/General/html/#{filename}.html").replace(/^ +| +$</gm, '').replace(/\r?\n/g, '')})"
 
   html = (template) ->
     parts = template.split /([\$&@]){([^}`]*)}/