Added life-changing stuff from mastering emacs
Merge remote-tracking branch 'refs/remotes/origin/master'