reworked the site
more sitework
Merge branch 'master' of https://github.com/urbit/urbit

Conflicts:
	urb/zod/main/pub/src/doc/ref/vol2.md
	urb/zod/main/pub/src/site/res/sidebar.html
merge conflicts