Highlight merges done using GitHub's web interface
highlight merges of remote-tracking branches
Merge branch 'merge-highlighting'
never page on `git r`, `git h`, etc.
clarify args to less
group mail by thread and sort by sender, not date
update mail server fingerprint
remove debug comment from html.vim
disable vim backups
indent slim two spaces, not four
don't set -e in alias; it kills the whole shell
^S in zsh inserts selecta result immediately
remove zsh git completion; it's built in now
add git ignores
switch mutt from chrome to firefox
remove .autotest
align lines in color scheme
cursor line isn't bold
Revert "switch mutt from chrome to firefox"

This reverts commit e6c64a3717bc778c5b0ae4c5f65b643595d9474f.
Move numerical sort earlier in the pipeline