History get
Merge branch 'shell' of https://github.com/urbit/urbit into shell

Conflicts:
	urb/urbit.pill
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/terminal/core.hook
Merge branch 'shell' of https://github.com/urbit/urbit into shell