Improved conjugate gradient:
	corrected a bug which meant that the guess was unused
	uses the iteration result with the least error
	add jacobi iterations after CG and when resetting the direction
Fixed a bug where the search direction was not updated after doing jacobi