Collapse all of the keybindings to a single set.
Merge pull request #61 from smashwilson/consistent-keybindings

Collapse all of the keybindings to a single set.