Adding setxkbmap option with "" clears previously set options
Update vim surround plugin
Update xvim repo