Change diary edit default to showing a year ahead

And move that into the settings file (along with the default choice for
using popups for editing)