did a little editing - don't want to have to do a complicated merge later so I'm pushing it up now
Merge pull request #11 from PCCMathProgramReview2014/alex-work

did a little editing - don't want to have to do a complicated merge late...