Updated master to use the Spotify API rather than echonest.

Also deduplicated the results.