Universal analytics

Updated code to support Universal Analytics whilst still supporting the previous version of Analytics.

Tested and performed as expected on a Universal Analytics implementation and one with no Analytics.

Needs to be tested on old Analytics code to ensure it still works.