moved some stuff around

Conflicts:
	init.el