Merge remote-tracking branch 'origin/key-bindings'

Conflicts:
	src/startup.coffee

src/require.coffee

@@ -4,6 +4,9 @@ paths = [
   "/Users/chris/Code/Atomicity/src",
   "/Users/chris/Code/Atomicity/plugins",
 
+  "/Users/corey/code/mine/Atomicity/src",
+  "/Users/corey/code/mine/Atomicity/plugins",
+
   "#{resourcePath}/src",
   "#{resourcePath}/plugins",
   "#{resourcePath}/vendor"

src/startup.coffee

@@ -3,7 +3,18 @@ App = require 'app'
 Window = require 'window'
 App.setActiveWindow new Window controller: WindowController
 
+window.handleKeyEvent = (event) ->
+  if event.keyCode == 50
+    console.log("Got `")
+    true
+  else if (event.modifierFlags & OSX.NSCommandKeyMask) and event.keyCode == 12 # cmd and q pushed
+    console.log("Cmd-Q")
+    true
+  else
+    console.log(event.keyCode)
+    false
+
 Editor = require 'editor'
 App.activeWindow.document = new Editor
 
-require 'plugins'
+require 'plugins'