Edits to analytics changes

wiki and user_id_map tables finalized