Feature/universal analytics

Update to universal analytics, and track new upgrade differently.