Merge branch 'master' of https://github.com/urbit/urbit into test

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

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

    Conflicts:
            urb/urbit.pill