Use smarter keyboard setting, add keybinding for magit

Conflicts:
	init.el