Rearrange mapping and remove leftover debug stuff.
Merge branch 'keybindingtweaks' of github.com:victoredwardocallaghan/cumino into keybindingtweaks