Show guide-key hints for % sequences in dired
Show clock sums as hours and minutes, not "n days" etc.
Add org-pomodoro
Enable melpa-stable
Disable package-check-signature if gpg is not available
Remove unused package-filter-function code: use package-pinned-packages instead
Disable marmalade
Tidy init-editing-utils somewhat
Use shift-ret for newline at end of line
Bind <up> to previous history item in ido completion map
Enable haskell-stylish-on-save by default
Disable auto-compile pending an upstream fix for #181
Keep .smex-items in ~/.emacs.d rather than home dir
Ignore ~/.emacs.d/.smex-items
Restore auto-compile now upstream fix is available for #181

This reverts commit 19bf8ec0479ec86555afeff4fe54f5e312341f76.
Remove local nxml patch for ERB: we're using mmm-mode instead anyway
Centralise html config in new init-html.el
Note about how site-lisp is used for package.el in Emacs 23
Use setq-default for js2 default overrides
Remove references to obsolete js2-mode variables