some more tweaks and added a comment to get info about currently configured custom vars
Merge branch 'master' of github.com:piwik/piwik