Major cleanup of model code, add medications
Merge pull request #41 from paulirwin/master

Major cleanup of model code, add medications