Allow for joining on either sessionId or userKey in funnel query. minor code cleanup.  Change table name to events.events_dev.