add multi-fidelity metamodel
Add IMultiFiSurrogate and IPredictor interfaces
Add multi-fidelity cokriging surrogate, test and example
add multi-fidelity cokriging surrogate
Merge branch 'dev' of http://github.com/OpenMDAO/OpenMDAO-Framework into add_multifi_metamodel
minor updates and a little pep8 cleanup
Merge pull request #1 from JustinSGray/multi-fi

minor updates and a little pep8 cleanup
merged in dev
Merge pull request #2 from JustinSGray/multi-fi

Needed to update you to the latest dev
some work to get KSP working
stuff
Conflict resolution
Merge branch 'dev' of https://github.com/OpenMDAO/OpenMDAO-Framework into mpi
debugging
debug
works, but don't like the result
cleanup
conflict resolve
added design docs outline
debugging