Merge branch 'better-models' of github.com:CodePilotCo/CMS
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Fixed merge conflicts and such
Merge pull request #124 from glenwayguy/master

Fixed merge conflicts.