Remove default keymapping
Merge remote-tracking branch 'lucas/master'