Cambios menores en vimrc y zshrc
Merge branch 'master' of https://github.com/penicolas/dotfiles

Conflicts:
	.vimrc