Fix commit authorship, start work on merging repos.