Pain in the ass to merge. Just went and did it all by hand. This is a
merger between the unique username branch and master.