Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  add puppet mode, align code and some local elisp files
  Add ibuffer
  Add highlight mode
  Add git-gutter mode, for it set fringe to 8
  new backup handling using backups-mode

diff --cc .emacs.d/config/emacs.org
Simple merge