Tarball rewrites

I think the commit history got jacked up. If this sucks too much I can close and reopen.