diff --git a/.arclint b/.arclint
--- a/.arclint
+++ b/.arclint
@@ -1,9 +1,6 @@
 {
   "exclude": [
-    "(^externals/)",
-    "(^src/console/__tests__/wrap/.*\\.txt(\\.expect)?$)",
-    "(^src/markup/engine/__tests__/remarkup/.*\\.txt$)",
-    "(^src/markup/syntax/highlighter/__tests__/xhpast/.*\\.(expect|source)$)"
+    "(^externals/)"
   ],
   "linters": {
     "chmod": {
@@ -41,21 +38,7 @@
       "type": "spelling"
     },
     "text": {
-      "type": "text",
-      "exclude": [
-        "(^support/xhpast/\\w+\\.(hpp|l|y)$)",
-        "(^\\.arclint$)"
-      ]
-    },
-    "text-without-length": {
-      "type": "text",
-      "severity": {
-        "3": "disabled"
-      },
-      "include": [
-        "(^support/xhpast/\\w+\\.(hpp|l|y)$)",
-        "(^\\.arclint$)"
-      ]
+      "type": "text"
     },
     "xhpast": {
       "type": "xhpast",
diff --git a/.editorconfig b/.editorconfig
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,9 +3,20 @@
 [*]
 indent_style = space
 indent_size = 2
+end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+max_line_length = 80
+
+[.arclint]
+max_line_length =
+
+[support/xhpast/*.{cpp,hpp,l,y}]
+max_line_length =
+
+[resources/ssl/*.pem]
+max_line_length =
 
 [src/markup/engine/__tests__/remarkup/*.txt]
 trim_trailing_whitespace = false
@@ -13,6 +24,10 @@
 
 [src/parser/__tests__/json/*.data]
 insert_final_newline = false
+max_line_length =
+
+[src/parser/__tests__/json/*.json]
+max_line_length =
 
 [src/parser/__tests__/languageguesser/*]
 indent_style =
@@ -20,6 +35,25 @@
 [Makefile]
 indent_style = tab
 
+[src/markup/syntax/highlighter/__tests__/phpfragment/*.expect]
+max_line_length =
+
+[src/console/__tests__/wrap/*.txt{,.expect}]
+charset = latin1
+trim_trailing_whitespace = false
+insert_final_newline = false
+max_line_length =
+
+[src/markup/engine/__tests__/remarkup/*.txt]
+trim_trailing_whitespace = false
+max_line_length =
+
+[src/markup/syntax/highlighter/__tests__/xhpast/*.expect]
+max_line_length =
+
+[src/markup/syntax/highlighter/__tests__/xhpast/*.{expect,source}]
+insert_final_newline = false
+
 [externals/**]
 ; Use editor default (possible autodetection).
 indent_style =
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/