almost there
Merge branch 'master' of github.com:mmcdermott/disease-modeling
Finalizing, prepping move to deliverables
Merge branch 'master' of github.com:mmcdermott/disease-modeling