Added piwik tracking back in. Added analytics to new base layouts. Added analytics info to site metadata