Updated plugins

sources_non_forked/vim-snippets/snippets/vim.snippets

@@ -4,13 +4,13 @@ snippet header
 	" Description: ${3}
 	${4:" Last Modified: `strftime("%B %d, %Y")`}
 snippet guard
-	if exists('${1:did_`Filename()`}') || &cp${2: || version < 700}
+	if exists('${1:did_`vim_snippets#Filename()`}') || &cp${2: || version < 700}
 		finish
 	endif
 	let $1 = 1${3}
 snippet f
 	fun! ${1:`expand('%') =~ 'autoload' ? substitute(matchstr(expand('%:p'),'autoload/\zs.*\ze.vim'),'[/\\]','#','g').'#' : ''`}${2:function_name}(${3})
-		${4:" code}
+		${4}
 	endf
 snippet t
 	try
@@ -19,19 +19,25 @@ snippet t
 		${3}
 	endtry
 snippet for
-	for ${1:needle} in ${2:haystack}
-		${3:" code}
+	for ${1} in ${2}
+		${3}
 	endfor
+snippet forkv
+	for [${1},${2}] in items(${3})
+		${4}
+            unlet $1 $2
+	endfor
+
 snippet wh
-	while ${1:condition}
-		${2:" code}
+	while ${1}
+		${2}
 	endw
 snippet if
-	if ${1:condition}
-		${2:" code}
+	if ${1}
+		${2}
 	endif
 snippet ife
-	if ${1:condition}
+	if ${1}
 		${2}
 	else
 		${3}