Use smarter keyboard setting, add keybinding for magit

Conflicts:
	init.el
require package before setting melpa stuff
require package before setting melpa stuff