Load all keymaps found in ~/.atom/keymaps

src/app/keymap.coffee

@@ -28,6 +28,12 @@ class Keymap
     $(document).command 'open', => atom.open()
     $(document).command 'open-unstable', => atom.openUnstable()
 
+  loadBundledKeymaps: ->
+    @loadDirectory(require.resolve('keymaps'))
+
+  loadUserKeymaps: ->
+    @loadDirectory(fs.join(config.configDirPath, 'keymaps'))
+
   loadDirectory: (directoryPath) ->
     @load(filePath) for filePath in fs.list(directoryPath)
 

src/app/window.coffee

@@ -60,7 +60,8 @@ windowAdditions =
 
     @keymap = new Keymap()
     @keymap.bindDefaultKeys()
-    @keymap.loadDirectory(require.resolve('keymaps'))
+    @keymap.loadBundledKeymaps()
+    @keymap.loadUserKeymaps()
 
     @_handleKeyEvent = (e) => @keymap.handleKeyEvent(e)
     $(document).on 'keydown', @_handleKeyEvent