Merge branch 'master' of vampire:etc/profile

* 'master' of vampire:etc/profile:
  dot/ditz-config: Configuration for `ditz' bug tracker.
  el/dot-emacs.el: Load ERC configuration in advance.
  hacks/ssh: Add new hack for setting up background SSH master connections.
  bin/svnwrap: Fix unjustifiably stupid error.
  dot/ercrc.el: Common configuration for ERC.

diff --cc el/dot-emacs.el
Simple merge

diff --cc setup
Simple merge