Switch away from feedburner, clean up a little