Moving to evil-mode, lots of changes