Dammit, clobbered the baseurl again.
Merge pull request #404 from rhyolight/site-reorg

Dammit, clobbered the baseurl again.