Merge commit 'duc/experimental' into experimental

diff --combined examples/configs/sampleconfig-dev
index 0dcc0d2,002f550..3e2920f
--- 1/examples/configs/sampleconfig-dev
--- 2/examples/configs/sampleconfig-dev
+++ b/examples/configs/sampleconfig-dev
@@@ -2,13 -2,13 +2,13 @@@
  # example uzbl config. in a real config, we should obey the xdg spec
  # all settings are optional.  you can use uzbl without any config at all (but it won't do much)
  
- # keyboard behavior is vimstyle by default (all actions -> 1 key). set
+ # keyboard behavior is vimstyle by default (all commands -> 1 key). set
  # always_insert_mode to always be in insert mode and disable going out of it.
- # if you do this, make sure you've set a modkey so you can reach the actions
+ # if you do this, make sure you've set a modkey so you can reach the commands
  # from insert mode by combining them with the modkey
  
  # TODO: ability to attach misc things (spawn <foo>, script <bar>,.. to internal events)
- # Usually you want to spawn a script to handle things, but any action (such as sh) can be used
+ # Usually you want to spawn a script to handle things, but any command (such as sh) can be used
  set history_handler  = spawn ./examples/scripts/history.sh
  set download_handler = spawn ./examples/scripts/download.sh
  set cookie_handler   = spawn ./examples/scripts/cookies.sh
@@@ -60,7 -60,7 +60,7 @@@ set shell_cmd         = sh -
  set show_status       = 1
  # you can optionally use this setting to override the background color of the statusbar from your GTK theme.
  set status_background = #303030
 -set status_format     = <span font_family="monospace"><span background="khaki" foreground="black">MODE</span> [<span weight="bold" foreground="red">KEYCMD</span>] <span foreground="#606060"> LOAD_PROGRESSBAR </span><span foreground="#99FF66">URI</span> <span foreground="khaki">NAME</span> <span foreground="orange">MSG</span><span foreground="#606060">SELECTED_URI</span></span>
 +set status_format     = <span font_family="monospace"><span background="khaki" foreground="black">[MODE]</span> [<span weight="bold" foreground="red">KEYCMD</span>] <span foreground="#606060"> LOAD_PROGRESSBAR </span><span foreground="#99FF66">URI</span> <span foreground="khaki">NAME</span> <span foreground="orange">MSG</span><span foreground="#606060">SELECTED_URI</span></span>
  set status_top = 0
  # define how your titlebar should look like. (short = statusbar is also shown, long = show everything you must see if statusbar is off)
  set title_format_short = TITLE - Uzbl browser <NAME>
@@@ -69,8 -69,7 +69,8 @@@ set title_format_long = KEYCMD MODE TIT
  set status_pbar_done  = *
  set status_pbar_pending = -
  set status_pbar_width = 12
 -
 +set insert_indicator = I
 +set command_indicator = C
  set modkey = Mod1
  # reset to command mode when new page is loaded
  set reset_command_mode = 1
@@@ -131,9 -130,9 +131,9 @@@ bind    ytitle    = spawn ./examples/sc
  # does the same as yurl but without needing a script
  bind    y2url     = sh 'echo -n $6 | xclip'
  # go the page from primary selection
- bind    p         = sh "echo act uri `xclip -selection primary -o` > $4"
+ bind    p         = sh "echo uri `xclip -selection primary -o` > $4"
  # go to the page in clipboard
- bind    P         = sh "echo act uri `xclip -selection clipboard -o` > $4"
+ bind    P         = sh "echo uri `xclip -selection clipboard -o` > $4"
  bind    ZZ        = exit
  bind    S         = js alert("hi");
  # example showing how to use sh
@@@ -143,8 -142,7 +143,7 @@@
  # you must enclose it in quotes.  Remember to escape (and double-escape) quotes and backslashes
  # in the body.  Any additional parameters you use will appear AFTER the default parameters (cfg file
  # path, fifo & socket dirs, etc.)
- bind    XS        = sh 'echo "act script alert (\\"This is sent by the shell via a fifo\\")" > "$4"'
- 
+ bind    XS        = sh 'echo "js alert (\\"This is sent by the shell via a fifo\\")" > "$4"'
  
  # this script allows you to configure (per domain) values to fill in form fields (eg login information) and to fill in these values automatically
  bind za = spawn ./examples/scripts/formfiller.sh