update vimrc
Merge branch 'master' of github.com:xiongbo/myvim
Merge branch 'master' of github.com:xiongbo/myvim

Conflicts:
	.vimrc
Merge branch 'master' of github.com:xiongbo/myvim