Merge pull request #87 from PCCMathProgramReview2014/chris-work

edits from Steve in 5C and 6