Cleanup of meal sorting
Updated Filter VC to use new model
Merge pull request #129 from MIT-Mobile/3.6/dev-intrepid-svoigt

Filtering updated to use new models