Merge remote-tracking branch 'origin/appendix'
Change $EDITOR in .zshenv
Merge branch 'master' of github.com:jtwp470/dotfiles