removed mapped events from upcoming and filtered start=datetime.now() so that all day events don't stay on the feed all day. Every event gets a chance to be seen on upcoming
Merge branch 'upcoming'