Fix lost keys when opening command line for the first time. Fix cleanup issue.

--HG--
branch : groups

common/modules/base.jsm

@@ -917,6 +917,7 @@ Module.INIT = {
             let module = this, objs = {};
             for (let i in locals)
                 module = objs[i] = Object.create(module);
+            module.isLocalModule = true;
 
             modules.jsmodules[this.constructor.className] = module;
             locals.reverse().forEach(function (fn, i) update(objs[i], fn.apply(module, args)))

common/modules/overlay.jsm

@@ -156,11 +156,16 @@ var Overlay = Module("Overlay", {
                      "completion",
                      "config",
                      "downloads",
+                     "finder",
+                     "highlight",
+                     "io",
                      "javascript",
                      "overlay",
                      "prefs",
                      "services",
                      "storage",
+                     "styles",
+                     "template",
                      "util"
                     ].forEach(function (name) defineModule.time("load", name, require, null, jsmodules, name));
 
@@ -174,17 +179,12 @@ var Overlay = Module("Overlay", {
                      "commands",
                      "editor",
                      "events",
-                     "finder",
-                     "highlight",
                      "hints",
-                     "io",
                      "mappings",
                      "marks",
                      "mow",
                      "options",
-                     "statusline",
-                     "styles",
-                     "template"
+                     "statusline"
                      ].forEach(function (name) defineModule.time("load", name, modules.load, modules, name));
 
                     config.scripts.forEach(modules.load);