Add hotkeys

In this PR:
* Re-enable support for hotkeys, which Jeff added in a previous commit, but which I inadvertently deleted during a rebase.
* General code cleanup - variable names, removing unused methods and files, etc.