More refinements to evil-mode, fixing up some packages
Adding shift-k and shift-j