moved some stuff around

Conflicts:
	init.el
Merge branch 'master' into work

Conflicts:
	init.el