Couple of new aliases
Update z
Merge branch 'master' of https://github.com/tyom/dotfiles