Merge my offline changes with upstream pushes on k

ssh://k.sfconservancy.org/website had incoming changes for me.