Pull in a few changes from upstream.
Fix git status in zsh prompt.
Make `ess-mode` inherit from `prog-mode`, to inherit some goodies for programming in general.
Set up `mu4e`, ensure that zsh files are opened in `sh-mode`.
Set vim up for R development.
Add melpa-stable, and continue to add missing packages to the cask file.