fix conflicts...forgot to pull from editor-stats first

src/packages/editor-stats/keymaps/editor-stats.cson

@@ -1,5 +1,2 @@
-'body, .editor-stats':
-  'meta-alt-s': 'editor-stats:toggle'
-
-'.editor-stats':
+'body':
   'meta-alt-s': 'editor-stats:toggle'

src/packages/editor-stats/spec/editor-stats-spec.coffee

@@ -2,7 +2,7 @@ $ = require 'jquery'
 RootView = require 'root-view'
 EditorStats = require 'editor-stats/src/editor-stats-view'
 
-fdescribe "EditorStats", ->
+describe "EditorStats", ->
   [rootView, editorStats, editor, date, time] = []
 
   simulateKeyUp = (key) ->
@@ -43,4 +43,3 @@ fdescribe "EditorStats", ->
       expect(editorStats.eventLog[time]).toBe 1
       simulateClick()
       expect(editorStats.eventLog[time]).toBe 2
-

src/packages/editor-stats/src/editor-stats-view.coffee

@@ -1,7 +1,5 @@
-{$$$} = require 'space-pen'
 ScrollView = require 'scroll-view'
-$ = require 'jquery'
-_ = require 'underscore'
+d3 = require 'd3.v3'
 
 module.exports =
 class EditorStatsView extends ScrollView
@@ -14,7 +12,6 @@ class EditorStatsView extends ScrollView
     "#{hour}:#{minute}"
 
   startDate = new Date
-  d3 = require 'd3.v3'
   x  = d3.scale.ordinal().domain d3.range(hours * 60)
   y  = d3.scale.linear()
 
@@ -36,7 +33,7 @@ class EditorStatsView extends ScrollView
   @serialize: ->
     @instance.serialize()
 
-  eventLog: [],
+  eventLog: []
 
   initialize: (@rootView, @eventLog = {}) ->
     super
@@ -125,5 +122,4 @@ class EditorStatsView extends ScrollView
 
   detach: =>
     super()
-    @remove()
-    @rootView.focus()
+    @rootView.focus()

src/packages/editor-stats/stylesheets/editor-stats.css

@@ -40,4 +40,4 @@
 
 .editor-stats path.domain {
   fill: none;
-}
+}