Model cleanup
Merge branch 'development' of github.com:ericfransen/dinner_dash into development
Merge branch 'development' of github.com:ericfransen/dinner_dash into development
Fixing tests
Merge branch 'development' of github.com:ericfransen/dinner_dash into development