Steve's dual credit revisions
trying to manually merge again
Merge branch 'master' into alex-work
Merge pull request #143 from PCCMathProgramReview2014/alex-work

Steve's dual credit revisions