xxx
Merge branch 'master' of https://github.com/panchenjin/dotvim

Conflicts:
	.vimrc