Merge piwik.html into analytics.html

Addresses #1512.