Updated to use universal analytics

Not tested yet