Get everything together for first merge with master.