Added support for more Trilinos preconditioners and solvers. Need to think about how to deal with the wealth of options!