Allow player to cancel options/keybindings

As it was, the new settings were kept in memory (though not written to
disk) even if the player canceled out of options/keybindings.

Fixes issue #385.