格式化 wcq.vim
Merge branch 'master' of github.com:wuchangqian/vimrc

Conflicts:
	plugin/wcq.vim