Added smoother conversion functions between per-day and per-time-step amounts, including a global dictionary to convert between the two. Fixed bug in herd_e_allocate related to this conversion.