Minor rewording
Remove some problematic menu-bar-mode logic
Merge remote-tracking branch 'upstream/master'