updated code, removed vi keybindings. fixes #42