models and migrations
Merge branch 'master' into neal
Merge pull request #3 from nealcpeters/neal

Neal