changes
Merge branch 'master' of https://github.com/qianlifeng/SQVIM

Conflicts:
	_vimrc