Add "upstream" alias.
Merge branch 'master' of github.com:tobinjt/dotfiles