Updated Piwik
Merge branch 'gh-pages' of http://github.com/tfrce/stopwatchingus into gh-pages

Conflicts:
	_layouts/default.html
	_site/companies.html
	_site/index.html
	_site/individuals.html
	_site/organizations.html