Modeline tweaks.
Merge branch 'v2-reboot' of https://github.com/daemianmack/emacs-starter-kit into v2-reboot
paren match faces.
Resolve merge conflict.
Resolve merge conflict.