"Upcoming" should still show events in progress

[boutell]

This logic:

        cursor.and({
          start: { $gte: new Date() }
        });        

Will drop events that already started even if they last a week.

I suggest:

cursor.and({ end: { $lte: new Date() } })