Update genres-tree.yaml

Scraped https://en.wikipedia.org/wiki/List_of_popular_music_genres for the first time since @KraYmer did back in (apparently) October 2011. This should be much more useful now to those who have genre canonicalization enabled. Script is in public repo of mine :)
Alphabetize! Thanks @KraYmer
Update genres-tree.yaml
Change expected result for compatibility with updated genres-tree.yaml
Merge remote-tracking branch 'origin/patch-2' into patch-1
Correct busted encoding hopefully
Merge pull request #924 from nrgetik/patch-1

Update genres-tree.yaml using scraping script <https://github.com/nrgetik/genre-cannon>.