Merge fork back to original repo

We should merge our repo with the original, then delete the fork.