smashwilson/merge-conflicts — pull request #56 by smashwilson (2014-05-25 16:29:58+00:00)
Title: Linux and Windows keybindings

This adds keybindings for Windows and Linux. I'm changing to a `Ctrl-M` prefixed chord sequence, because the `Ctrl-Alt` space is too crowded.