Rework path-shortening algorithm.
Merge branch 'master' of https://github.com/ryanq/dotfiles