New proxy data

OK, here's the big update. Lots of commits. Lots of changes. Sorry I didn't do this more incrementally. This is all in the new-proxy-data branch on my github. But, grab it, and make sure we're all kosher!