add conflicted key binding name in the warning message
expand previous tabjump shortcut from ctrl+1...ctrl+9 to ctrl1...ctrl+0
Merge pull request #214 from spacewander/master

add conflicted key binding name in the warning message