sha
Merge branch 'master' of github.com:scottdavis/dotfiles

* 'master' of github.com:scottdavis/dotfiles:
  Update aliases
  Update aliases