merge changes with vim_hl_lvar

Conflicts:
	lib/patm.rb