Church29 form alphabetization

This should resolve merge conflicts with OSU-Net, and fix the remaining alphabetization issues. Looks like the hashes are the same as they are upstream.