smashwilson/merge-conflicts — pull request #61 by smashwilson (2014-06-15 17:45:56+00:00)
Title: Collapse all of the keybindings to a single set.

As reported in #60, `Cmd-M` is a system keybinding for "minimize window" on a Mac. This collapses all three keybinding sections to use the same `Ctrl-M`-prefixed chords everywhere. Easier for muscle memory when I'm flipping platforms anyway.