altsvc updates

OK, here it goes. Due to merge conflicts when doing the most recent rebase, there's some more noise in the commits than one would normally expect, but it still works, and since this is just for demoing in NY, who cares about commit noise? Also, should have all build errors fixed on non-mac-debug platforms (last I checked, at least).