Merge.
Roll back links to the beta site.
Some links to the beta site that I missed.
Change people links to link to the site.
Point 'more' links at the site.
Fix the links in the 'more' index page.
Hopefully fix some more links.
Merge.