Merge pull request #5 from thearn/master

Updates from the last week
Textually simpler, but functionally identical, CADRE_mdp.py
Merge branch 'master' of github.com:OpenMDAO-Plugins/CADRE into bug

Conflicts:
	src/CADRE/CADRE_mdp.py
Merge pull request #6 from setowns1/bug

Textually simpler, but functionally identical, CADRE_mdp.py
Merge branch 'master' of https://github.com/OpenMDAO-Plugins/CADRE.git

Conflicts:
	src/CADRE/CADRE_mdp.py