Improve Google Analytics

#746 

**Requires testing in 3.x on dev server.** Some tests cannot be done locally and require a working Google Analytics account to test.