Merge branch 'master' into win32-specs

Conflicts:
	tasks/spec-task.coffee

package.json

@@ -82,7 +82,7 @@
     "solarized-dark-syntax": "0.6.0",
     "solarized-light-syntax": "0.2.0",
     "archive-view": "0.16.0",
-    "autocomplete": "0.18.0",
+    "autocomplete": "0.19.0",
     "autoflow": "0.11.0",
     "autosave": "0.10.0",
     "bookmarks": "0.15.0",

script/bootstrap

@@ -37,6 +37,8 @@ var commands = [
   'git submodule --quiet update --recursive --init',
   {command: 'npm install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
   {command: 'npm install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
+  {command: 'npm install --quiet ' + apmVendorPath, options: {ignoreStdout: true}},
+  {command: 'node ../../apm/node_modules/atom-package-manager/bin/apm rebuild', options: {cwd: path.resolve('node_modules', 'atom-package-manager'), ignoreStdout: true}},
   echoNewLine,
   'node apm/node_modules/atom-package-manager/bin/apm clean ' + apmFlags,
   'node apm/node_modules/atom-package-manager/bin/apm install --quiet ' + apmFlags,

src/package-manager.coffee

@@ -39,7 +39,7 @@ class PackageManager
 
   # Public: Get the path to the apm command
   getApmPath: ->
-    @apmPath ?= require.resolve('../apm/node_modules/atom-package-manager/bin/apm')
+    @apmPath ?= require.resolve('atom-package-manager/bin/apm')
 
   # Public: Get the paths being used to look for packages.
   #

src/pane.coffee

@@ -37,6 +37,7 @@ class Pane extends View
       @items = _.compact @state.get('items').map (item) ->
         item = atom.deserializers.deserialize(item)
         item?.created?()
+        return if item?.state?.isDestroyed?()
         item
     else
       @items = args