small modifications to our models and migrations to fix bugs
Merge pull request #6 from kelmerp/model_changes

small modifications to our models and migrations to fix bugs