Merge commit 'metalzone/master'

Merge commit 'metalzone/master'

* commit 'metalzone/master':
  emacs, dot-emacs: Fix WoMan configuration.
  dot-emacs: Fix mdw-check-autorevert.
  dot-emacs: Fix calls to mdw-regexps.
  dot-emacs: Fix divvy-window for Emacs 21.
  dot-emacs: Fix the eval-when-compile stanza.
  dot-emacs: Squash complaints about use of interactive commands.
  dot-emacs: Flush stray close-paren.
  Now that Emacs starts up pretty quick, favour it over lesser editors.
  emacs: Stuff for fast startup.
  emacs: Keep the bookmarks file up to date.
  dot-emacs, gitconfig, colordiffrc: Fix fontification for diffs.
  Emacs, aspell: Make Emacs use aspell; configure aspell for use.
  Fix pstree output.

Conflicts:

	dot-emacs.el: Python keywords: add `with'; use mdw-regexps.