Fix mpdhelper ValueError on weird disc values

As with the fix that was present for the track property, disc could
be formatted as, eg, 1/2.  This fixes that, and moves the cleanup
for both track and disc into a common function.
Add more tests for weird disc values
Fix mpdhelper ValueError on weird disc values