diff --git a/.arclint b/.arclint
index 4539b52e59..0077bdf518 100644
--- a/.arclint
+++ b/.arclint
@@ -1,102 +1,87 @@
 {
   "exclude": [
     "(^externals/)",
-    "(^webroot/rsrc/externals/(?!javelin/))",
-    "(/__tests__/data/)"
+    "(^webroot/rsrc/externals/(?!javelin/))"
   ],
   "linters": {
     "chmod": {
       "type": "chmod"
     },
     "filename": {
       "type": "filename"
     },
     "generated": {
       "type": "generated"
     },
     "javelin": {
       "type": "javelin",
       "include": "(\\.js$)",
       "exclude": [
         "(^support/aphlict/)"
       ]
     },
     "jshint-browser": {
       "type": "jshint",
       "include": "(\\.js$)",
       "exclude": [
         "(^support/aphlict/server/.*\\.js$)",
         "(^webroot/rsrc/externals/javelin/core/init_node\\.js$)"
       ],
       "jshint.jshintrc": "support/lint/browser.jshintrc"
     },
     "jshint-node": {
       "type": "jshint",
       "include": [
         "(^support/aphlict/server/.*\\.js$)",
         "(^webroot/rsrc/externals/javelin/core/init_node\\.js$)"
       ],
       "jshint.jshintrc": "support/lint/node.jshintrc"
     },
     "json": {
       "type": "json",
       "include": [
         "(^src/docs/book/.*\\.book$)",
         "(^support/lint/jshintrc$)",
         "(^\\.arcconfig$)",
         "(^\\.arclint$)",
         "(\\.json$)"
       ]
     },
     "merge-conflict": {
       "type": "merge-conflict"
     },
     "nolint": {
       "type": "nolint"
     },
     "phutil-library": {
       "type": "phutil-library",
       "include": "(\\.php$)"
     },
     "phutil-xhpast": {
       "type": "phutil-xhpast",
       "include": "(\\.php$)",
       "phutil-xhpast.deprecated.functions": {
         "phutil_escape_html": "The phutil_escape_html() function is deprecated. Raw strings passed to phutil_tag() or hsprintf() are escaped automatically."
       }
     },
     "spelling": {
       "type": "spelling"
     },
     "text": {
-      "type": "text",
-      "exclude": [
-        "(^\\.arclint$)",
-        "(^resources/sql/quickstart.sql$)"
-      ]
-    },
-    "text-without-length": {
-      "type": "text",
-      "severity": {
-        "3": "disabled"
-      },
-      "include": [
-        "(^\\.arclint$)",
-        "(^resources/sql/quickstart.sql$)"
-      ]
+      "type": "text"
     },
     "xhpast": {
       "type": "xhpast",
       "include": "(\\.php$)",
       "severity": {
         "16": "advice",
         "34": "error"
       },
       "xhpast.blacklisted.function": {
         "eval": "The eval() function should be avoided. It is potentially unsafe and makes debugging more difficult."
       },
       "xhpast.php-version": "5.2.3",
       "xhpast.php-version.windows": "5.3.0"
     }
   }
 }
diff --git a/.editorconfig b/.editorconfig
index 0722c45a96..fa17fc29f4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,15 +1,34 @@
 ; http://editorconfig.org/
 
 [*]
 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 =
+
+[resources/sql/**.sql]
+max_line_length =
+
+[scripts/install/install_*.sh]
+max_line_length =
+
+[src/applications/differential/parser/__tests__/data/*.diff]
+trim_trailing_whitespace = false
+
+[src/applications/differential/parser/__tests__/messages/long-title.txt]
+max_line_length =
+
+[src/applications/diffusion/ssh/__tests__/hgwiredata/*.txt]
+max_line_length =
 
 [externals/**]
-; Use editor default (possible autodetection).
 indent_style =
 indent_size =
 trim_trailing_whitespace = false
 insert_final_newline = false
diff --git a/LICENSE b/LICENSE
index f433b1a53f..d9a10c0d8e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,177 +1,176 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
    1. Definitions.
 
       "License" shall mean the terms and conditions for use, reproduction,
       and distribution as defined by Sections 1 through 9 of this document.
 
       "Licensor" shall mean the copyright owner or entity authorized by
       the copyright owner that is granting the License.
 
       "Legal Entity" shall mean the union of the acting entity and all
       other entities that control, are controlled by, or are under common
       control with that entity. For the purposes of this definition,
       "control" means (i) the power, direct or indirect, to cause the
       direction or management of such entity, whether by contract or
       otherwise, or (ii) ownership of fifty percent (50%) or more of the
       outstanding shares, or (iii) beneficial ownership of such entity.
 
       "You" (or "Your") shall mean an individual or Legal Entity
       exercising permissions granted by this License.
 
       "Source" form shall mean the preferred form for making modifications,
       including but not limited to software source code, documentation
       source, and configuration files.
 
       "Object" form shall mean any form resulting from mechanical
       transformation or translation of a Source form, including but
       not limited to compiled object code, generated documentation,
       and conversions to other media types.
 
       "Work" shall mean the work of authorship, whether in Source or
       Object form, made available under the License, as indicated by a
       copyright notice that is included in or attached to the work
       (an example is provided in the Appendix below).
 
       "Derivative Works" shall mean any work, whether in Source or Object
       form, that is based on (or derived from) the Work and for which the
       editorial revisions, annotations, elaborations, or other modifications
       represent, as a whole, an original work of authorship. For the purposes
       of this License, Derivative Works shall not include works that remain
       separable from, or merely link (or bind by name) to the interfaces of,
       the Work and Derivative Works thereof.
 
       "Contribution" shall mean any work of authorship, including
       the original version of the Work and any modifications or additions
       to that Work or Derivative Works thereof, that is intentionally
       submitted to Licensor for inclusion in the Work by the copyright owner
       or by an individual or Legal Entity authorized to submit on behalf of
       the copyright owner. For the purposes of this definition, "submitted"
       means any form of electronic, verbal, or written communication sent
       to the Licensor or its representatives, including but not limited to
       communication on electronic mailing lists, source code control systems,
       and issue tracking systems that are managed by, or on behalf of, the
       Licensor for the purpose of discussing and improving the Work, but
       excluding communication that is conspicuously marked or otherwise
       designated in writing by the copyright owner as "Not a Contribution."
 
       "Contributor" shall mean Licensor and any individual or Legal Entity
       on behalf of whom a Contribution has been received by Licensor and
       subsequently incorporated within the Work.
 
    2. Grant of Copyright License. Subject to the terms and conditions of
       this License, each Contributor hereby grants to You a perpetual,
       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
       copyright license to reproduce, prepare Derivative Works of,
       publicly display, publicly perform, sublicense, and distribute the
       Work and such Derivative Works in Source or Object form.
 
    3. Grant of Patent License. Subject to the terms and conditions of
       this License, each Contributor hereby grants to You a perpetual,
       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
       (except as stated in this section) patent license to make, have made,
       use, offer to sell, sell, import, and otherwise transfer the Work,
       where such license applies only to those patent claims licensable
       by such Contributor that are necessarily infringed by their
       Contribution(s) alone or by combination of their Contribution(s)
       with the Work to which such Contribution(s) was submitted. If You
       institute patent litigation against any entity (including a
       cross-claim or counterclaim in a lawsuit) alleging that the Work
       or a Contribution incorporated within the Work constitutes direct
       or contributory patent infringement, then any patent licenses
       granted to You under this License for that Work shall terminate
       as of the date such litigation is filed.
 
    4. Redistribution. You may reproduce and distribute copies of the
       Work or Derivative Works thereof in any medium, with or without
       modifications, and in Source or Object form, provided that You
       meet the following conditions:
 
       (a) You must give any other recipients of the Work or
           Derivative Works a copy of this License; and
 
       (b) You must cause any modified files to carry prominent notices
           stating that You changed the files; and
 
       (c) You must retain, in the Source form of any Derivative Works
           that You distribute, all copyright, patent, trademark, and
           attribution notices from the Source form of the Work,
           excluding those notices that do not pertain to any part of
           the Derivative Works; and
 
       (d) If the Work includes a "NOTICE" text file as part of its
           distribution, then any Derivative Works that You distribute must
           include a readable copy of the attribution notices contained
           within such NOTICE file, excluding those notices that do not
           pertain to any part of the Derivative Works, in at least one
           of the following places: within a NOTICE text file distributed
           as part of the Derivative Works; within the Source form or
           documentation, if provided along with the Derivative Works; or,
           within a display generated by the Derivative Works, if and
           wherever such third-party notices normally appear. The contents
           of the NOTICE file are for informational purposes only and
           do not modify the License. You may add Your own attribution
           notices within Derivative Works that You distribute, alongside
           or as an addendum to the NOTICE text from the Work, provided
           that such additional attribution notices cannot be construed
           as modifying the License.
 
       You may add Your own copyright statement to Your modifications and
       may provide additional or different license terms and conditions
       for use, reproduction, or distribution of Your modifications, or
       for any such Derivative Works as a whole, provided Your use,
       reproduction, and distribution of the Work otherwise complies with
       the conditions stated in this License.
 
    5. Submission of Contributions. Unless You explicitly state otherwise,
       any Contribution intentionally submitted for inclusion in the Work
       by You to the Licensor shall be under the terms and conditions of
       this License, without any additional terms or conditions.
       Notwithstanding the above, nothing herein shall supersede or modify
       the terms of any separate license agreement you may have executed
       with Licensor regarding such Contributions.
 
    6. Trademarks. This License does not grant permission to use the trade
       names, trademarks, service marks, or product names of the Licensor,
       except as required for reasonable and customary use in describing the
       origin of the Work and reproducing the content of the NOTICE file.
 
    7. Disclaimer of Warranty. Unless required by applicable law or
       agreed to in writing, Licensor provides the Work (and each
       Contributor provides its Contributions) on an "AS IS" BASIS,
       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
       implied, including, without limitation, any warranties or conditions
       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
       PARTICULAR PURPOSE. You are solely responsible for determining the
       appropriateness of using or redistributing the Work and assume any
       risks associated with Your exercise of permissions under this License.
 
    8. Limitation of Liability. In no event and under no legal theory,
       whether in tort (including negligence), contract, or otherwise,
       unless required by applicable law (such as deliberate and grossly
       negligent acts) or agreed to in writing, shall any Contributor be
       liable to You for damages, including any direct, indirect, special,
       incidental, or consequential damages of any character arising as a
       result of this License or out of the use or inability to use the
       Work (including but not limited to damages for loss of goodwill,
       work stoppage, computer failure or malfunction, or any and all
       other commercial damages or losses), even if such Contributor
       has been advised of the possibility of such damages.
 
    9. Accepting Warranty or Additional Liability. While redistributing
       the Work or Derivative Works thereof, You may choose to offer,
       and charge a fee for, acceptance of support, warranty, indemnity,
       or other liability obligations and/or rights consistent with this
       License. However, in accepting such obligations, You may act only
       on Your own behalf and on Your sole responsibility, not on behalf
       of any other Contributor, and only if You agree to indemnify,
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
diff --git a/src/applications/diffusion/data/__tests__/DiffusionGitBranchTestCase.php b/src/applications/diffusion/data/__tests__/DiffusionGitBranchTestCase.php
index 68f4170fda..90b36347e1 100644
--- a/src/applications/diffusion/data/__tests__/DiffusionGitBranchTestCase.php
+++ b/src/applications/diffusion/data/__tests__/DiffusionGitBranchTestCase.php
@@ -1,41 +1,41 @@
 <?php
 
 final class DiffusionGitBranchTestCase
   extends PhabricatorTestCase {
 
   public function testRemoteBranchParser() {
 
     $output = <<<EOTXT
   origin/HEAD           -> origin/master
   origin/accent-folding bfaea2e72197506e028c604cd1a294b6e37aa17d Add...
   origin/eventordering  185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3 RFC: Order...
   origin/master         713f1fc54f9cfc830acbf6bbdb46a2883f772896 Automat...
   alternate/stuff       4444444444444444444444444444444444444444 Hmm...
 origin/HEAD 713f1fc54f9cfc830acbf6bbdb46a2883f772896
-origin/weekend-refactoring 6e947ab0498b82075ca6195ac168385a11326c4b
+origin/refactoring 6e947ab0498b82075ca6195ac168385a11326c4b
 alternate/release-1.0.0 9ddd5d67962dd89fa167f9989954468b6c517b87
 
 EOTXT;
 
     $this->assertEqual(
       array(
-        'origin/accent-folding'      => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
-        'origin/eventordering'       => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
-        'origin/master'              => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
-        'alternate/stuff'            => '4444444444444444444444444444444444444444',
-        'origin/weekend-refactoring' => '6e947ab0498b82075ca6195ac168385a11326c4b',
-        'alternate/release-1.0.0'    => '9ddd5d67962dd89fa167f9989954468b6c517b87',
+        'origin/accent-folding'   => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
+        'origin/eventordering'    => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
+        'origin/master'           => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
+        'alternate/stuff'         => '4444444444444444444444444444444444444444',
+        'origin/refactoring'      => '6e947ab0498b82075ca6195ac168385a11326c4b',
+        'alternate/release-1.0.0' => '9ddd5d67962dd89fa167f9989954468b6c517b87',
       ),
       DiffusionGitBranch::parseRemoteBranchOutput($output));
 
     $this->assertEqual(
       array(
-        'accent-folding'      => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
-        'eventordering'       => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
-        'master'              => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
-        'weekend-refactoring' => '6e947ab0498b82075ca6195ac168385a11326c4b',
+        'accent-folding' => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
+        'eventordering'  => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
+        'master'         => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
+        'refactoring'    => '6e947ab0498b82075ca6195ac168385a11326c4b',
       ),
       DiffusionGitBranch::parseRemoteBranchOutput($output, 'origin'));
   }
 
 }
diff --git a/src/docs/book/contributor.book b/src/docs/book/contributor.book
index e10ab0866d..776417aa6d 100644
--- a/src/docs/book/contributor.book
+++ b/src/docs/book/contributor.book
@@ -1,36 +1,36 @@
 {
-  "name" : "phabcontrib",
-  "title" : "Phabricator Contributor Documentation",
-  "short" : "Phabricator Contributor Docs",
-  "preface" : "Information for Phabricator contributors.",
-  "root" : "../../../",
-  "uri.source" :
+  "name": "phabcontrib",
+  "title": "Phabricator Contributor Documentation",
+  "short": "Phabricator Contributor Docs",
+  "preface": "Information for Phabricator contributors.",
+  "root": "../../../",
+  "uri.source":
     "https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
-  "rules" : {
-    "(\\.diviner$)" : "DivinerArticleAtomizer"
+  "rules": {
+    "(\\.diviner$)": "DivinerArticleAtomizer"
   },
-  "exclude" : [
+  "exclude": [
     "(^externals/)",
     "(^webroot/rsrc/externals/)",
     "(^scripts/)",
     "(^support/)",
     "(^resources/)",
     "(^src/docs/user/)",
     "(^src/docs/tech/)",
     "(^src/docs/flavor/)"
   ],
-  "groups" : {
-    "contrib" : {
-      "name" : "Contributor Overview"
+  "groups": {
+    "contrib": {
+      "name": "Contributor Overview"
     },
     "detail": {
-      "name" : "Contributing in Detail"
+      "name": "Contributing in Detail"
     },
-    "standards" : {
-      "name" : "Coding Standards"
+    "standards": {
+      "name": "Coding Standards"
     },
-    "developer" : {
-      "name" : "Developer Guides"
+    "developer": {
+      "name": "Developer Guides"
     }
   }
 }
diff --git a/src/docs/book/flavor.book b/src/docs/book/flavor.book
index 92e5158ece..b13ed9956c 100644
--- a/src/docs/book/flavor.book
+++ b/src/docs/book/flavor.book
@@ -1,42 +1,42 @@
 {
-  "name" : "phabflavor",
-  "title" : "Phabricator Flavor Text",
-  "short" : "Flavor Text",
-  "preface" : "Recommendations, lore, and dark rituals.",
-  "root" : "../../../",
-  "uri.source" :
+  "name": "phabflavor",
+  "title": "Phabricator Flavor Text",
+  "short": "Flavor Text",
+  "preface": "Recommendations, lore, and dark rituals.",
+  "root": "../../../",
+  "uri.source":
     "https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
-  "rules" : {
-    "(\\.diviner$)" : "DivinerArticleAtomizer"
+  "rules": {
+    "(\\.diviner$)": "DivinerArticleAtomizer"
   },
-  "exclude" : [
+  "exclude": [
     "(^externals/)",
     "(^webroot/rsrc/externals/)",
     "(^scripts/)",
     "(^support/)",
     "(^resources/)",
     "(^src/docs/user/)",
     "(^src/docs/tech/)",
     "(^src/docs/contributor/)"
   ],
-  "groups" : {
-    "overview" : {
-      "name" : "Overview"
+  "groups": {
+    "overview": {
+      "name": "Overview"
     },
-    "review" : {
-      "name" : "Revision Control and Code Review"
+    "review": {
+      "name": "Revision Control and Code Review"
     },
-    "sundry" : {
-      "name" : "Sundries"
+    "sundry": {
+      "name": "Sundries"
     },
-    "lore" : {
-      "name" : "Phabricator Lore"
+    "lore": {
+      "name": "Phabricator Lore"
     },
-    "php" : {
-      "name" : "PHP"
+    "php": {
+      "name": "PHP"
     },
-    "javascript" : {
-      "name" : "Javascript"
+    "javascript": {
+      "name": "Javascript"
     }
   }
 }
diff --git a/src/docs/book/phabricator.book b/src/docs/book/phabricator.book
index cf363a647d..d0f26f64e9 100644
--- a/src/docs/book/phabricator.book
+++ b/src/docs/book/phabricator.book
@@ -1,273 +1,273 @@
 {
-  "name" : "phabdev",
-  "title" : "Phabricator Technical Documentation",
-  "short" : "Phabricator Tech Docs",
-  "preface" : "Technical documentation intended for Phabricator developers.",
-  "root" : "../../../",
-  "uri.source" :
+  "name": "phabdev",
+  "title": "Phabricator Technical Documentation",
+  "short": "Phabricator Tech Docs",
+  "preface": "Technical documentation intended for Phabricator developers.",
+  "root": "../../../",
+  "uri.source":
     "https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
-  "rules" : {
-    "(\\.php$)" : "DivinerPHPAtomizer",
-    "(\\.diviner$)" : "DivinerArticleAtomizer"
+  "rules": {
+    "(\\.php$)": "DivinerPHPAtomizer",
+    "(\\.diviner$)": "DivinerArticleAtomizer"
   },
-  "exclude" : [
+  "exclude": [
     "(^externals/)",
     "(^webroot/rsrc/externals/)",
     "(^scripts/)",
     "(^support/)",
     "(^resources/)",
     "(^src/docs/user/)",
     "(^src/docs/flavor/)",
     "(^src/docs/contributor/)"
   ],
-  "groups" : {
-    "arcanist" : {
-      "name" : "Arcanist Integration",
-      "include" : "(^src/applications/arcanist/)"
+  "groups": {
+    "arcanist": {
+      "name": "Arcanist Integration",
+      "include": "(^src/applications/arcanist/)"
     },
-    "audit" : {
-      "name" : "Audit",
-      "include" : "(^src/applications/audit/)"
+    "audit": {
+      "name": "Audit",
+      "include": "(^src/applications/audit/)"
     },
-    "auth" : {
-      "name" : "Auth",
-      "include" : "(^src/applications/auth/)"
+    "auth": {
+      "name": "Auth",
+      "include": "(^src/applications/auth/)"
     },
-    "baseapp" : {
-      "name" : "Application Basics",
-      "include" : "(^src/applications/base/)"
+    "baseapp": {
+      "name": "Application Basics",
+      "include": "(^src/applications/base/)"
     },
-    "cache" : {
-      "name" : "Cache",
-      "include" : "(^src/applications/cache/)"
+    "cache": {
+      "name": "Cache",
+      "include": "(^src/applications/cache/)"
     },
-    "calendar" : {
-      "name" : "Calendar",
-      "include" : "(^src/applications/calendar/)"
+    "calendar": {
+      "name": "Calendar",
+      "include": "(^src/applications/calendar/)"
     },
-    "chatlog" : {
-      "name" : "Chatlog",
-      "include" : "(^src/applications/chatlog/)"
+    "chatlog": {
+      "name": "Chatlog",
+      "include": "(^src/applications/chatlog/)"
     },
-    "conduit" : {
-      "name" : "Conduit",
-      "include" : "(^src/applications/conduit/)"
+    "conduit": {
+      "name": "Conduit",
+      "include": "(^src/applications/conduit/)"
     },
-    "config" : {
-      "name" : "Config",
-      "include" : "(^src/applications/config/)"
+    "config": {
+      "name": "Config",
+      "include": "(^src/applications/config/)"
     },
-    "conpherence" : {
-      "name" : "Conpherence",
-      "include" : "(^src/applications/conpherence/)"
+    "conpherence": {
+      "name": "Conpherence",
+      "include": "(^src/applications/conpherence/)"
     },
-    "countdown" : {
-      "name" : "Countdown",
-      "include" : "(^src/applications/countdown/)"
+    "countdown": {
+      "name": "Countdown",
+      "include": "(^src/applications/countdown/)"
     },
-    "daemon" : {
-      "name" : "Daemons",
-      "include" : "(^src/applications/daemon/)"
+    "daemon": {
+      "name": "Daemons",
+      "include": "(^src/applications/daemon/)"
     },
-    "differential" : {
-      "name" : "Differential",
-      "include" : "(^src/applications/differential/)"
+    "differential": {
+      "name": "Differential",
+      "include": "(^src/applications/differential/)"
     },
-    "diffusion" : {
-      "name" : "Diffusion",
-      "include" : "(^src/applications/diffusion/)"
+    "diffusion": {
+      "name": "Diffusion",
+      "include": "(^src/applications/diffusion/)"
     },
-    "directory" : {
-      "name" : "Directory",
-      "include" : "(^src/applications/directory/)"
+    "directory": {
+      "name": "Directory",
+      "include": "(^src/applications/directory/)"
     },
-    "diviner" : {
-      "name" : "Diviner",
-      "include" : "(^src/applications/diviner/)"
+    "diviner": {
+      "name": "Diviner",
+      "include": "(^src/applications/diviner/)"
     },
-    "doorkeeper" : {
-      "name" : "Doorkeeper",
-      "include" : "(^src/applications/doorkeeper/)"
+    "doorkeeper": {
+      "name": "Doorkeeper",
+      "include": "(^src/applications/doorkeeper/)"
     },
-    "draft" : {
-      "name" : "Draft",
-      "include" : "(^src/applications/draft/)"
+    "draft": {
+      "name": "Draft",
+      "include": "(^src/applications/draft/)"
     },
-    "drydock" : {
-      "name" : "Drydock",
-      "include" : "(^src/applications/drydock/)"
+    "drydock": {
+      "name": "Drydock",
+      "include": "(^src/applications/drydock/)"
     },
-    "fact" : {
-      "name" : "Fact",
-      "include" : "(^src/applications/fact/)"
+    "fact": {
+      "name": "Fact",
+      "include": "(^src/applications/fact/)"
     },
-    "feed" : {
-      "name" : "Feed",
-      "include" : "(^src/applications/feed/)"
+    "feed": {
+      "name": "Feed",
+      "include": "(^src/applications/feed/)"
     },
-    "files" : {
-      "name" : "Files",
-      "include" : "(^src/applications/files/)"
+    "files": {
+      "name": "Files",
+      "include": "(^src/applications/files/)"
     },
-    "flag" : {
-      "name" : "Flags",
-      "include" : "(^src/applications/flag/)"
+    "flag": {
+      "name": "Flags",
+      "include": "(^src/applications/flag/)"
     },
-    "harbormaster" : {
-      "name" : "Harbormaster",
-      "include" : "(^src/applications/harbormaster/)"
+    "harbormaster": {
+      "name": "Harbormaster",
+      "include": "(^src/applications/harbormaster/)"
     },
-    "help" : {
-      "name" : "Help",
-      "include" : "(^src/applications/help/)"
+    "help": {
+      "name": "Help",
+      "include": "(^src/applications/help/)"
     },
-    "herald" : {
-      "name" : "Herald",
-      "include" : "(^src/applications/herald/)"
+    "herald": {
+      "name": "Herald",
+      "include": "(^src/applications/herald/)"
     },
-    "legalpad" : {
-      "name" : "Legalpad",
-      "include" : "(^src/applications/legalpad/)"
+    "legalpad": {
+      "name": "Legalpad",
+      "include": "(^src/applications/legalpad/)"
     },
-    "lipsum" : {
-      "name" : "Lipsum",
-      "include" : "(^src/applications/lipsum/)"
+    "lipsum": {
+      "name": "Lipsum",
+      "include": "(^src/applications/lipsum/)"
     },
-    "macro" : {
-      "name" : "Macro",
-      "include" : "(^src/applications/macro/)"
+    "macro": {
+      "name": "Macro",
+      "include": "(^src/applications/macro/)"
     },
-    "mailinglists" : {
-      "name" : "Mailing Lists",
-      "include" : "(^src/applications/mailinglists/)"
+    "mailinglists": {
+      "name": "Mailing Lists",
+      "include": "(^src/applications/mailinglists/)"
     },
-    "maniphest" : {
-      "name" : "Maniphest",
-      "include" : "(^src/applications/maniphest/)"
+    "maniphest": {
+      "name": "Maniphest",
+      "include": "(^src/applications/maniphest/)"
     },
-    "meta" : {
-      "name" : "Meta",
-      "include" : "(^src/applications/meta/)"
+    "meta": {
+      "name": "Meta",
+      "include": "(^src/applications/meta/)"
     },
-    "metamta" : {
-      "name" : "MetaMTA",
-      "include" : "(^src/applications/metamta/)"
+    "metamta": {
+      "name": "MetaMTA",
+      "include": "(^src/applications/metamta/)"
     },
-    "notification" : {
-      "name" : "Notifications",
-      "include" : "(^src/applications/notification/)"
+    "notification": {
+      "name": "Notifications",
+      "include": "(^src/applications/notification/)"
     },
-    "oauthserver" : {
-      "name" : "OAuth Server",
-      "include" : "(^src/applications/oauthserver/)"
+    "oauthserver": {
+      "name": "OAuth Server",
+      "include": "(^src/applications/oauthserver/)"
     },
-    "owners" : {
-      "name" : "Owners",
-      "include" : "(^src/applications/owners/)"
+    "owners": {
+      "name": "Owners",
+      "include": "(^src/applications/owners/)"
     },
-    "paste" : {
-      "name" : "Paste",
-      "include" : "(^src/applications/paste/)"
+    "paste": {
+      "name": "Paste",
+      "include": "(^src/applications/paste/)"
     },
-    "people" : {
-      "name" : "People",
-      "include" : "(^src/applications/people/)"
+    "people": {
+      "name": "People",
+      "include": "(^src/applications/people/)"
     },
-    "phame" : {
-      "name" : "Phame",
-      "include" : "(^src/applications/phame/)"
+    "phame": {
+      "name": "Phame",
+      "include": "(^src/applications/phame/)"
     },
-    "phid" : {
-      "name" : "PHIDs",
-      "include" : "(^src/applications/phid/)"
+    "phid": {
+      "name": "PHIDs",
+      "include": "(^src/applications/phid/)"
     },
-    "phlux" : {
-      "name" : "Phlux",
-      "include" : "(^src/applications/phlux/)"
+    "phlux": {
+      "name": "Phlux",
+      "include": "(^src/applications/phlux/)"
     },
-    "pholio" : {
-      "name" : "Pholio",
-      "include" : "(^src/applications/pholio/)"
+    "pholio": {
+      "name": "Pholio",
+      "include": "(^src/applications/pholio/)"
     },
-    "phortune" : {
-      "name" : "Phortune",
-      "include" : "(^src/applications/phortune/)"
+    "phortune": {
+      "name": "Phortune",
+      "include": "(^src/applications/phortune/)"
     },
-    "phpast" : {
-      "name" : "PHPAST",
-      "include" : "(^src/applications/phpast/)"
+    "phpast": {
+      "name": "PHPAST",
+      "include": "(^src/applications/phpast/)"
     },
-    "phrequent" : {
-      "name" : "Phrequent",
-      "include" : "(^src/applications/phrequent/)"
+    "phrequent": {
+      "name": "Phrequent",
+      "include": "(^src/applications/phrequent/)"
     },
-    "phriction" : {
-      "name" : "Phriction",
-      "include" : "(^src/applications/phriction/)"
+    "phriction": {
+      "name": "Phriction",
+      "include": "(^src/applications/phriction/)"
     },
-    "policy" : {
-      "name" : "Policy",
-      "include" : "(^src/applications/policy/)"
+    "policy": {
+      "name": "Policy",
+      "include": "(^src/applications/policy/)"
     },
-    "ponder" : {
-      "name" : "Ponder",
-      "include" : "(^src/applications/ponder/)"
+    "ponder": {
+      "name": "Ponder",
+      "include": "(^src/applications/ponder/)"
     },
-    "project" : {
-      "name" : "Projects",
-      "include" : "(^src/applications/project/)"
+    "project": {
+      "name": "Projects",
+      "include": "(^src/applications/project/)"
     },
-    "releeph" : {
-      "name" : "Releeph",
-      "include" : "(^src/applications/releeph/)"
+    "releeph": {
+      "name": "Releeph",
+      "include": "(^src/applications/releeph/)"
     },
-    "remarkup" : {
-      "name" : "Remarkup",
-      "include" : "(^src/applications/remarkup/)"
+    "remarkup": {
+      "name": "Remarkup",
+      "include": "(^src/applications/remarkup/)"
     },
-    "repository" : {
-      "name" : "Repositories",
-      "include" : "(^src/applications/repository/)"
+    "repository": {
+      "name": "Repositories",
+      "include": "(^src/applications/repository/)"
     },
-    "search" : {
-      "name" : "Search",
-      "include" : "(^src/applications/search/)"
+    "search": {
+      "name": "Search",
+      "include": "(^src/applications/search/)"
     },
-    "settings" : {
-      "name" : "Settings",
-      "include" : "(^src/applications/settings/)"
+    "settings": {
+      "name": "Settings",
+      "include": "(^src/applications/settings/)"
     },
-    "slowvote" : {
-      "name" : "Slowvote",
-      "include" : "(^src/applications/slowvote/)"
+    "slowvote": {
+      "name": "Slowvote",
+      "include": "(^src/applications/slowvote/)"
     },
-    "subscriptions" : {
-      "name" : "Subscriptions",
-      "include" : "(^src/applications/subscriptions/)"
+    "subscriptions": {
+      "name": "Subscriptions",
+      "include": "(^src/applications/subscriptions/)"
     },
-    "system" : {
-      "name" : "System",
-      "include" : "(^src/applications/system/)"
+    "system": {
+      "name": "System",
+      "include": "(^src/applications/system/)"
     },
-    "tokens" : {
-      "name" : "Tokens",
-      "include" : "(^src/applications/tokens/)"
+    "tokens": {
+      "name": "Tokens",
+      "include": "(^src/applications/tokens/)"
     },
-    "transactions" : {
-      "name" : "Transactions",
-      "include" : "(^src/applications/transactions/)"
+    "transactions": {
+      "name": "Transactions",
+      "include": "(^src/applications/transactions/)"
     },
-    "typeahead" : {
-      "name" : "Typeahead",
-      "include" : "(^src/applications/typeahead/)"
+    "typeahead": {
+      "name": "Typeahead",
+      "include": "(^src/applications/typeahead/)"
     },
-    "uiexample" : {
-      "name" : "UI Examples",
-      "include" : "(^src/applications/uiexample/)"
+    "uiexample": {
+      "name": "UI Examples",
+      "include": "(^src/applications/uiexample/)"
     },
-    "xhprof" : {
-      "name" : "XHProf",
-      "include" : "(^src/applications/xhprof/)"
+    "xhprof": {
+      "name": "XHProf",
+      "include": "(^src/applications/xhprof/)"
     }
   }
 }
diff --git a/src/docs/book/user.book b/src/docs/book/user.book
index e05fb21f20..18b6c6db6c 100644
--- a/src/docs/book/user.book
+++ b/src/docs/book/user.book
@@ -1,51 +1,51 @@
 {
-  "name" : "phabricator",
-  "title" : "Phabricator User Documentation",
-  "short" : "Phabricator User Docs",
-  "preface" : "Instructions for installing, configuring, and using Phabricator.",
-  "root" : "../../../",
-  "uri.source" :
+  "name": "phabricator",
+  "title": "Phabricator User Documentation",
+  "short": "Phabricator User Docs",
+  "preface": "Instructions for installing, configuring, and using Phabricator.",
+  "root": "../../../",
+  "uri.source":
     "https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
-  "rules" : {
-    "(\\.diviner$)" : "DivinerArticleAtomizer"
+  "rules": {
+    "(\\.diviner$)": "DivinerArticleAtomizer"
   },
-  "exclude" : [
+  "exclude": [
     "(^externals/)",
     "(^webroot/rsrc/externals/)",
     "(^scripts/)",
     "(^support/)",
     "(^resources/)",
     "(^src/docs/tech/)",
     "(^src/docs/flavor/)",
     "(^src/docs/contributor/)"
   ],
-  "groups" : {
-    "intro" : {
-      "name" : "Introduction"
+  "groups": {
+    "intro": {
+      "name": "Introduction"
     },
-    "config" : {
-      "name" : "Configuration"
+    "config": {
+      "name": "Configuration"
     },
-    "userguide" : {
-      "name" : "Application User Guides"
+    "userguide": {
+      "name": "Application User Guides"
     },
-    "differential" : {
-      "name" : "Differential (Code Review)"
+    "differential": {
+      "name": "Differential (Code Review)"
     },
-    "diffusion" : {
-      "name" : "Diffusion (Repository Browser)"
+    "diffusion": {
+      "name": "Diffusion (Repository Browser)"
     },
-    "maniphest" : {
-      "name" : "Maniphest (Task Tracking)"
+    "maniphest": {
+      "name": "Maniphest (Task Tracking)"
     },
-    "slowvote" : {
-      "name" : "Slowvote (Polls)"
+    "slowvote": {
+      "name": "Slowvote (Polls)"
     },
-    "herald" : {
-      "name" : "Herald (Notifications)"
+    "herald": {
+      "name": "Herald (Notifications)"
     },
-    "phriction" : {
-      "name" : "Phriction (Wiki)"
+    "phriction": {
+      "name": "Phriction (Wiki)"
     }
   }
 }
diff --git a/webroot/rsrc/externals/javelin/LICENSE b/webroot/rsrc/externals/javelin/LICENSE
index 7d06b3778a..cc10f0dabd 100644
--- a/webroot/rsrc/externals/javelin/LICENSE
+++ b/webroot/rsrc/externals/javelin/LICENSE
@@ -1,24 +1,24 @@
 Copyright (c) 2009, Evan Priestley and Facebook, inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
     * Neither the name of Facebook, inc. nor the names of its contributors
       may be used to endorse or promote products derived from this software
       without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.