More code cleanup and better use of Piwik::log
Merge branch 'master' of https://github.com/piwik/piwik