tweaks to js/tracker.php if-then
cc @matt revert "rename piwik -> Piwik cc @diosmosis", only rename 'piwik' not 'piwik.org'

This reverts commit a3d1561cf6b8c97a6010bcffdf94e8f92a23940a.
Updating VisitorGenerator submodule.