merged current branches

diff --cc lib/gui_qt.py
Simple merge

diff --cc lib/simple_config.py
index a71c481,582cd05..6a007be
--- 1/lib/simple_config.py
--- 2/lib/simple_config.py
+++ b/lib/simple_config.py
@@@ -3,7 -3,7 +3,8 @@@ import o
  from util import user_dir
  
  class SimpleConfig:
-   default_options = {"gui": "lite", "proxy": { "mode": "none", "host":"localhost", "port":"8080" } }
 -  default_options = {"gui": "lite", "winpos-qt": [100, 100, 840, 400], "winpos-lite": [4, 25, 351, 149], "history": False }
++  default_options = {"gui": "lite", "proxy": { "mode": "none", "host":"localhost", "port":"8080" },
++                    "winpos-qt": [100, 100, 840, 400], "winpos-lite": [4, 25, 351, 149], "history": False }
  
    def set_key(self, key, value, save = True):
      self.config[key] = value