vimrc.local from Dialog workspace.
Merge branch 'master' of https://github.com/weinimo/Configs-Vim

Conflicts:
	vimrc.local