More Evil-mode optimizations - using kj to escape insert mode. Fixed keybinding conflicts for commenting.