Fix upstream changes.
Add mousetrap.
Add the ability to control the game with the keyboard.