Moved zen_settings.py to zen_settings_orig.py for safe keeping; restored file to original version.  All unexpected behavior I've encountered so far all has had something to do with zen settings, so I've removed all of them for now to see if the problems continue.  If not, I might remove that feature from my fork entirely, as I'm not yet convinced that it's necessary or even all that useful.
Resolved conflicts