update
Merge branch 'master' of https://github.com/solome/vimrc

Conflicts:
	.vimrc