merge in from salinasv

diff --cc AUTHORS
index f77735f,f77735f..66bd93e
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -14,6 -14,6 +14,7 @@@ Contributors
      Evgeny Grablyk - libsoup settings
      Damien Leon - misc
      Peter Suschlik - backwards searching
++    (salinasv) - move some variables to heap
  
  Originaly based on http://trac.webkit.org/browser/trunk/WebKitTools/GtkLauncher/main.c
  Which is  copyrighted:

diff --cc uzbl.c
Simple merge

diff --cc uzbl.h
Simple merge