manually merged in my sublime settings, added keymap