Merge pull request #2 from hydrargyrum/master

UI: make the layout scrollable when there are many buttons
Re-enable Ctrl-X in the "choose key" dialog to shun a joystick button