more cleanup
stuff
more progress on stuff
isolver
conflict
working
Merge branch 'hifi' of https://github.com/Kenneth-T-Moore/OpenMDAO-Framework into pseudocomp
interim.  merged out and some tests broke