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
setq-default for javascript basic indent
Ignore ~/.emacs.d/image-dired
No need to bind TAB specially in js2-mode these days
Drop sanityinc/ido-choose-from-recentf in Emacs < 24
Prefix "adjust-opacity" function
Prefix "pp-xml-region" function
Drop superfluous translation-map entry (see #72)
plist files are xml
Use move-dup in place of move-text + hand-rolled duplicate-line
Use shift-RET to add a newline at the end of the current line
Explicitly zero line-spacing in term-mode (fixes #186)
Only use anzu if Emacs version >= 24

See https://github.com/syohex/emacs-anzu/commit/8e92765ab7ecb821017b4f03fa8678acc4720e53#diff-fea2dd3403e76294136c80b7bee7dbd8
Merge pull request #187 from dcorking/fix-anzu-dependency

Only use anzu if Emacs version >= 24
if => when
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lisp/init-ido.el