Merge remote-tracking branch 'origin/master' into cj-tabs-be-weird

Conflicts:
	package.json

README.md

@@ -48,7 +48,7 @@ Atom will automatically update when a new release is available.
 
 ### Windows Requirements
   * Windows 7 or later
-  * [Visual C++ 2010 SP1 Express](http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express)
+  * [Visual C++ 2010 SP1 Express](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_4)
   * [node.js - 32bit](http://nodejs.org/download/) v0.10.x
   * [Python 2.7.x](http://www.python.org/download/)
   * [GitHub for Windows](http://windows.github.com/)

build/package.json

@@ -27,6 +27,8 @@
     "json-front-matter": "~0.1.3",
     "legal-eagle": "~0.4.0",
     "minidump": "0.5.x",
+    "read-package-json": "1.1.8",
+    "normalize-package-data": "0.2.12",
     "rcedit": "~0.1.2",
     "request": "~2.27.0",
     "rimraf": "~2.2.2",

package.json

@@ -41,7 +41,7 @@
     "nslog": "0.5.0",
     "oniguruma": "^1.0.6",
     "optimist": "0.4.0",
-    "pathwatcher": "^1.2.3",
+    "pathwatcher": "^1.2.4",
     "property-accessors": "^1",
     "q": "^1.0.1",
     "random-words": "0.0.1",
@@ -50,13 +50,13 @@
     "runas": "^0.5",
     "scandal": "0.15.2",
     "scoped-property-store": "^0.9.0",
-    "scrollbar-style": "^0.3.0",
+    "scrollbar-style": "^0.4.0",
     "season": "^1.0.2",
     "semver": "1.1.4",
     "serializable": "^1",
     "space-pen": "3.1.1",
     "temp": "0.5.0",
-    "text-buffer": "^2.2.1",
+    "text-buffer": "^2.2.2",
     "theorist": "^1",
     "underscore-plus": "^1.2.1",
     "vm-compatibility-layer": "0.1.0"
@@ -112,7 +112,7 @@
     "language-css": "0.16.0",
     "language-gfm": "0.34.0",
     "language-git": "0.9.0",
-    "language-go": "0.10.0",
+    "language-go": "0.11.0",
     "language-html": "0.19.0",
     "language-hyperlink": "0.9.0",
     "language-java": "0.10.0",

src/atom.coffee

@@ -39,7 +39,7 @@ class Atom extends Model
   # Public: Load or create the Atom environment in the given mode.
   #
   # - mode: Pass 'editor' or 'spec' depending on the kind of environment you
-  #         want to build.
+  #   want to build.
   #
   # Returns an Atom instance, fully initialized
   @loadOrCreate: (mode) ->
@@ -479,6 +479,8 @@ class Atom extends Model
     @getCurrentWindow().isFullScreen()
 
   # Public: Get the version of the Atom application.
+  #
+  # Returns the version text {String}.
   getVersion: ->
     @constructor.getVersion()
 
@@ -488,7 +490,7 @@ class Atom extends Model
 
   # Public: Get the directory path to Atom's configuration area.
   #
-  # Returns the absolute path to ~/.atom
+  # Returns the absolute path to `~/.atom`.
   getConfigDirPath: ->
     @constructor.getConfigDirPath()
 

src/editor.coffee

@@ -576,7 +576,7 @@ class Editor extends Model
 
   bufferRowForScreenRow: (row) -> @displayBuffer.bufferRowForScreenRow(row)
 
-  # Public: Get the syntactic scopes for the most the given position in buffer
+  # Public: Get the syntactic scopes for the given position in buffer
   # coordinates.
   #
   # For example, if called with a position inside the parameter list of an

src/workspace-view.coffee

@@ -64,7 +64,7 @@ class WorkspaceView extends View
   @version: 4
 
   @configDefaults:
-    ignoredNames: [".git", ".svn", ".DS_Store", "Thumbs.db"]
+    ignoredNames: [".git", ".hg", ".svn", ".DS_Store", "Thumbs.db"]
     excludeVcsIgnoredPaths: true
     disabledPackages: []
     themes: ['atom-dark-ui', 'atom-dark-syntax']