Revert "Merge branch 'master' of https://github.com/monyone/.emacs.d"

This reverts commit d8efcf7639ef61f3ee931851b82cffcdd89970eb, reversing
changes made to 0bb474f07b9f6c001fbc9f92fe7517f5a64b99d5.