update
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules
	vimrc.global.vim