Need to merge

Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
Modify

Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
Modify vimrc

Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
Merge branch 'Vm' of https://github.com/xxxhoho/Configure_File into Vm

Conflicts:
	vimrc