Add 10 second time-out to keybinding dialog
Fix compiler warning
Merge pull request #608 from dorkster/bugfixes

Add 10 second time-out to keybinding dialog