Merge branch 'master' into win32-specs

Conflicts:
	tasks/spec-task.coffee

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