Add more notmuch configuration.
Merge branch 'master' of github.com:davexunit/.emacs.d