cleaning up code
switch to new Google Universal Analytics
Merge commit 'c45069835cbc31aee3e4417e074fe8b2ae34c06c' into talk-brackets
Merge commit 'e983b61c7aede142b29c617d82ad93458d279d24' into talk-brackets