Merge branch 'master' into atom-textarea

package.json

@@ -77,7 +77,7 @@
     "autocomplete-atom-api": "0.10.0",
     "autocomplete-css": "0.11.0",
     "autocomplete-html": "0.7.2",
-    "autocomplete-plus": "2.29.0",
+    "autocomplete-plus": "2.29.1",
     "autocomplete-snippets": "1.10.0",
     "autoflow": "0.27.0",
     "autosave": "0.23.1",

src/config.coffee

@@ -319,6 +319,23 @@ ScopeDescriptor = require './scope-descriptor'
 # * line breaks - `line breaks<br/>`
 # * ~~strikethrough~~ - `~~strikethrough~~`
 #
+# #### order
+#
+# The settings view orders your settings alphabetically. You can override this
+# ordering with the order key.
+#
+# ```coffee
+# config:
+#   zSetting:
+#     type: 'integer'
+#     default: 4
+#     order: 1
+#   aSetting:
+#     type: 'integer'
+#     default: 4
+#     order: 2
+# ```
+#
 # ## Best practices
 #
 # * Don't depend on (or write to) configuration keys outside of your keypath.