Fix diagonal preconditioner

[jrvanwhy]

Currently, the diagonal elements passed in for the Hessian preconditioner are handled poorly. Instead, let's use the current value only for the initial preconditioner then (if possible -- can this be calculated efficiently?) use the BFGS diagonal to fill in for nonpositive elements instead of a fixed 1.