Merge branch 'dev'

Conflicts:
	autoload/clever_f.vim