add cdpwd alias
Merge branch 'master' of https://github.com/ajh/dotfiles
Update z (again?)