Merge commit 'dequis/stdin' into experimental

diff --cc README
Simple merge

diff --cc uzbl.c
index dd76e25,31e9f0a..66f9595
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -2491,8 -2275,13 +2491,13 @@@ settings_init () 
      Network *n = &uzbl.net;
      int i;
      for (i = 0; default_config[i].command != NULL; i++) {
 -        parse_cmd_line(default_config[i].command);
 +        parse_cmd_line(default_config[i].command, NULL);
      }
+     
+     if (g_strcmp0(s->config_file, "-") == 0) {
+         s->config_file = NULL;
+         create_stdin();
+     }
  
      if (!s->config_file) {
          s->config_file = find_xdg_file (0, "/uzbl/config");