update vim modules
Merge branch 'master' of github.com:jeffy/dotfiles

Conflicts:
	.vim/update.sh