update
update
Merge branch 'master' of https://github.com/nicolaskagami/dotfiles

Conflicts:
	vim/vimbuilder.sh