Merge pull request #9 from thierer1/dev

Update models and data
Allow users to specify how many weeks back to use data