Did some modification on vimrc
Merge branch 'master' of github.com:LuqiPan/dotvim

Conflicts:
	.vimrc