-Changed Album to use artist/album title, rather than just album title,
as a key, among other changes