Index: config.py
==================================================================
--- config.py
+++ config.py
@@ -197,11 +197,11 @@
                 open(subdir+"/.nobackup", "w").close()
         # target filename
         file = self.dir + "/" + name
         # encode as JSON
         try:
-            data = json.dumps(data, indent=(4 if nice else None))
+            data = json.dumps(data, indent=(4 if nice else None), sort_keys=True)
         except Exception as e:
             log.ERR("JSON encoding failed", e)
             return
         # .gz or normal file
         if gz:

Index: st2.py
==================================================================
--- st2.py
+++ st2.py
@@ -397,12 +397,12 @@
         # initialize plugin modules (pre-ordered)
         ls = module_list()
         for name in ls:
             gui_startup(4/20.0 + 13.5/20.0 * float(ls.index(name))/len(ls), "loading module "+name)
 
-            # load defaults on first startup
-            if not name in conf.plugins:
+            # load defaults - on first startup - or with -D in any case
+            if not name in conf.plugins or conf.debug:
                 conf.add_plugin_defaults(plugin_meta(module=name), name)
             
             # skip module if disabled
             if conf.plugins.get(name, 1) == False:
                 log.STAT("disabled plugin:", name)