Update bundles
Merge branch 'master' of github.com:namick/dotfiles

Conflicts:
	vimrc