Fixed
Merge branch 'refactor'

Conflicts:
	autoload/gf/vimfn.vim