Album merging

Instead of marking the deluxe editions of albums into separate things, merge them into one album. So in the top albums section, instead of one position being filled with an album and another being filled by the deluxe version of the album, add the streams of both together and have it take up one spot. Could also add a section under the album information with the different editions (similar to the section in song information that shows the albums the song is in)