minor changes to include string changes
Merge commit '34131d2878447acced45dd8f226f508417e5c760' into reffed_repo
removed hardcoded preconditioner disable
fixed opencl
merge fix
made platform error make more sense
Merge commit '1f622d004aeaffffc19cee80c1679fdac00bc123' into reffed_repo