Frj omniture user tracking

AndyH did some work to track signed in users on next-gen, Ive removed the id js integration he did, which was duplicated at some point.

Ive also tweaked some of the tracking to make it consistent with the user tracking on other parts of the site.