update
Merge branch 'master' of github.com:nobodyiam/vim

Conflicts:
	.vim/vimrc