Add author, remove merges, adjust whitespace