fork and update from purcell
[https://github.com/purcell/emacs.d.git]
Merge remote-tracking branch 'origin/master'