fix vimdiff
fix rspec runner
remove tab keymaps so they don't conflict with CTRL+B
open ctrl-y into current file instead of split