Missed magit & moved some stuff around a bit