Various analytics.js Changes

As requested!