CG: Unified unpreconditioned and preconditioned in the same function.

There is no test for CG but I checked through solverbench that it led to *exactly* the same residual. Using inner_prod(x,x) instead of pow(norm2(x),2) results in a slightly different result (probably because of rounding errors)