Merge pull request #111 from PCCMathProgramReview2014/chris-work

changes from Steve
changes from Matt Funk (about SE) and one fixthis hopefully resolved