Re-org'ed some aliases, merged in aliases from old dotfiles.
Merge branch 'master' of github.com:rykugur/dotfiles