ZSH: Do not override file descriptors limits.
Do not check-in vim history file.
Merge branch 'master' of github.com:stefanozanella/dotfiles

Conflicts:
	.gitignore