提交前显示改变
Merge branch 'ubuntu'

Conflicts:
	shell/dotfilebackup
Merge branch 'ubuntu'
修改vim PopMenu颜色设置