Updated to account for variables seasons at traps

When traps do not start and stop at same time, this version does not
impute 0's for days outside the season, as previous version do.  This
version just uses traps actually operating.  This version also adds back
in F.passage to the list of options.
Final fixes on Doug's punch list