updated data
manual edits to merge lightning talks ad other joined talks