merge fixes

Conflicts:
	urb/zod/arvo/clay.hoon
Fixed typo
Merge branch 'nextbreach' of https://github.com/urbit/urbit into nextbreach
Fixing typo
new pill