modified models and migrations
Merge pull request #2 from JasonBenn/models

modified models and migrations