Fixed #26 for realsies.

That last commit, that only fixed some issues, this one also probably
only fixes some issues, but, we can now add songs (or albums (or
artists)) with an ampersand in their name. Which is wonderful.