Update aliases
Merge branch 'master' of github.com:twinge/dotfiles