Minor refactoring

Conflicts:
	init.el
Add C-hjkl vim style keybindings in normal mode