Merge branch 'master' of git://github.com/Dieterbe/uzbl into dieter/master