Contributor's merge history

Joshua Pukin's email was different between Github and Git, so his commits/merges are present, they were not listed in the contributors until part way through the project.