still working on kantrowitz section
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/openMDAO/master'
done for now.
Merge pull request #6 from jcchin/master

NASA-TM changes