Add piwik tracking code
Update tracking urls
Merge branch 'master' into production
Merge branch 'master' into production
Add keybase identity file