Restore my cfengine configuration
Use y-or-n-p in place of yes-or-no-p
Add flycheck files to .gitignore
Correct a footer
Pull an initsplit bugfix

This avoids the "Wrong type argument: markerp, nil" message when saving
customizations.
Pick up the current users settings not johnw's
Merge my ERC settings agains John's
Use my preferred fonts
Side-effect changes of saving customizations

This all appears to be API updates and in-file string layout changes.