have eyre convert to json
Merge branch 'shell' of https://github.com/urbit/urbit into shell

Conflicts:
	urb/urbit.pill