Fix menu command shortcut keys.
Remove old junk.
Merge pull request #1795 from aquanull/master

Fix Windows accelerators (menu command shortcuts) enabling/disabling