finally got google analytics working
merged with master