Merge addon-common module loading code to fix Minefield.

--HG--
extra : rebase_source : 6b5f0dc0a575a6d21892e18cbb56ab0230382356

common/modules/completion.jsm

@@ -6,11 +6,13 @@
 // given in the LICENSE.txt file included with this file.
 /* use strict */
 
-Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("completion", {
     exports: ["CompletionContext", "Completion", "completion"]
 }, this);
 
+lazyRequire("messages", ["_", "messages"]);
+lazyRequire("template", ["template"]);
+
 /**
  * Creates a new completion context.
  *