Remove two warnings
Fix a crasher when keybindings are unset
Merge pull request #53 from heftig/master

Some fixes