Updates to the scrobbler2 plugin

Multiple fixes on top of the previous version.
All new code is from the 2013 commits.