Merge testing.

--HG--
rename : common/content/base.js => common/modules/base.jsm
rename : common/content/services.js => common/modules/services.jsm
rename : common/content/style.js => common/modules/styles.jsm
rename : common/content/template.js => common/modules/template.jsm
rename : common/content/util.js => common/modules/util.jsm

pentadactyl/content/about.html

@@ -16,11 +16,9 @@
 <div style="text-align: center;">
 <img src="chrome://pentadactyl/content/logo.png" alt="Pentadactyl" />
 version ###VERSION###
-by Martin Stubenschrott et al.
+by Kris Maglione et al.
 Pentadactyl is open source and freely distributable
 
-Sponsor Pentadactyl development!</div><div style="padding-left: 5em;">type :help sponsor&lt;<span class="key">Enter</span>&gt;      for information
-
 type :q&lt;<span class="key">Enter</span>&gt;                 to exit
 type :help&lt;<span class="key">Enter</span>&gt;  or  &lt;<span class="key">F1</span>&gt;    for on-line help
 type :help version-2.1&lt;<span class="key">Enter</span>&gt;  for version info

pentadactyl/content/config.js

@@ -6,10 +6,6 @@
 // given in the LICENSE.txt file included with this file.
 
 const Config = Module("config", ConfigBase, {
-    init: function () {
-    },
-
-    /*** required options, no checks done if they really exist, so be careful ***/
     name: "Pentadactyl",
     hostApplication: "Firefox",
 
@@ -122,12 +118,13 @@ const Config = Module("config", ConfigBase, {
     },
 
     scripts: [
-        "browser.js",
-        "bookmarks.js",
-        "history.js",
-        "quickmarks.js",
-        "sanitizer.js",
-        "tabs.js"
+        "browser",
+        "bookmarkcache",
+        "bookmarks",
+        "history",
+        "quickmarks",
+        "sanitizer",
+        "tabs"
     ],
 
     get tempFile() {
@@ -299,6 +296,7 @@ const Config = Module("config", ConfigBase, {
             "<Up>": modes.NORMAL | modes.INSERT,
             "<Down>": modes.NORMAL | modes.INSERT
         };
+        config.modes.forEach(function (mode) { modes.addMode.apply(this, mode); });
     },
     options: function () {
         options.add(["online"],