Conflicts: .gitignore Makefile urb/urbit.pill Took both bpt and ed25519, and generated a new pill starting from master's.