Merge commit 'metalzone/master'

* commit 'metalzone/master':
  Configuration for top.
  emacs: Start actually doing some Emacs-side SLIME customization.
  bash_profile: Force ncurses to use UTF8 line-drawing characters.
  dot-emacs: remove stray debugging code.
  tig: Fix colours, in particular the cursor line.
  gitconfig: New alias `git files'.
  dot-emacs: Hack dired-maybe-insert-subdir to honour marks.
  gitignore: Ignore more boring things.
  tigrc: Don't bold entries in the diff.
  dot-emacs: Force buffer-file-coding-system to utf-8 for news articles.

diff --cc dot-emacs.el
Simple merge

diff --cc emacs
Simple merge

diff --cc gitconfig
Simple merge