and fixed colin's plot some more
Merge branch 'master' of github.com:mmcdermott/disease-modeling