More changes to

Apparently we've been hacked. Craptastic. I've changed all the files I think they affected, but I also removed a bunch of files that I didn't know I needed. Oh well, everything should get back to normal any time now.

Oh, yeah, and mail doesn't work. I'll see if I can fix that tonight.