Update and clean up
Add missing keymap to evil