Change analytics tracking code behaviour

[duncanc]

@luison Please see this new topic Potential improvement to google tracking , and add any suggestions for what the default parameter values should be.