Per-env UA code
Factory hotfix
Merge pull request #434 from tlvince/refactor/analytics

Analytics refactor