Few small changes.
Merge branch 'master' of github.com:tompurl/dotfiles

Conflicts:
	zsh-aliases