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
if => when
Fix broken enabling of electric pair mode (fixes #190)
Use zygospore to make C-x 1 toggleable

Conflicts:
	lisp/init-windows.el
haskell-interactive-mode
Enable haskell-auto-insert-module-template
Remove commented-out reference to haskell-indent
Enable various org-babel languages
Make haskell-mode-stylish-buffer a no-op when there are flycheck errors
Add git-timemachine
Use winner-undo instead of zygospore
Remove git-timemachine for now (see #194)