Dammit, clobbered the baseurl again.

A lot of the commits here were duplicated with work ongoing on master. This stuff has been put off to the side for quite awhile. But there are some nuggets of stuff I needed get get out of my branch and into master.