Re-enable Ctrl-X in the "choose key" dialog to shun a joystick button
Merge pull request #3 from hydrargyrum/master

Re-enable Ctrl-X in the "choose key" dialog to shun a joystick button