Alex made lots of edits from emails from Steve and Heiko the night of 1/20/14
Merge pull request #132 from PCCMathProgramReview2014/alex-work

Alex made lots of edits from emails from Steve and Heiko the night of 1/...