so I can rebase
addressed some fixthis items and changed a figure's xticklabels
Merge pull request #43 from PCCMathProgramReview2014/alex-work

Alex work