Merge remote-tracking branch 'origin/master' into status-bar-buffer-modified-indicator

src/app/project.coffee

@@ -55,6 +55,7 @@ class Project
       if @ignorePath(path)
         prune()
       else if fs.isFile(path)
+        prune()
         filePaths.push @relativize(path)
 
     deferred.resolve filePaths

src/stdlib/fs.coffee

@@ -109,7 +109,7 @@ module.exports =
     for path in @list(rootPath)
       recurse = true
       fn(path, prune)
-      @traverseTree(path, fn) if @isDirectory(path) and recurse
+      @traverseTree(path, fn) if recurse and @isDirectory(path)
 
   lastModified: (path) ->
     $native.lastModified(path)