removed poke-json from terminal
auto-convert from json to mark
Merge branch 'shell' into dish

Conflicts:
	urb/urbit.pill
Merge branch 'dish' of https://github.com/urbit/urbit into dish