Fixing google analytics with domain change; adding Paul Hammants feedback to TODO