I merged incorrectly, had to do it via github. Not sure why, but I think eveverything is good now.