Completed the code merge; updated google analytics code to only make one
request for data.