Merge branch 'notepad++'

This topic branch uses the excuse of adding Notepad++ as an optional
editor for Git to pay down some technical debt we accrued when we
stupidly copy-pasted the code to add new wizard pages/options.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho