updating.
Merge branch 'master' of github.com:spadin/dotfiles

Conflicts:
	git/aliases.zsh
	screen/aliases.zsh
	system/aliases.zsh