Cleaning up some busted shortcuts for evil, and disabling hjkl
Moving settings to the right places