Merge add-meal and edit-meal; Add function to naively guess meal name from time