Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emacs: Initial blogging support.
  emacs: Turn off fontification in shell mode.
  emacs: Force py-shell to start ipython with the right colours.
  bashrc, dircolors: Enable colouring for `dumb' terminals.
  dot-emacs: Clobber message-mode's header colours.

diff --cc dot-emacs.el
Simple merge

diff --cc emacs
Simple merge