Merge piwik.html into analytics.html

Addresses #1512.
Merge pull request #1518 from iKevinY/merge-analytics

Merge piwik.html into analytics.html