Merge lp://staging/~markjtully/unity-lens-music/genres into lp://staging/unity-lens-music

Added more genres to the genre map

This change adds extra genres to the genre map. It does not change any of the UI (ie. doesn't add any new genre filters) The new genre map looks like:

blues --> blues
classic --> classic, classical, opera (new)
country --> country
disco --> disco
funk --> funk
rock --> rock, heavy, hard, rock and roll (new)
metal --> metal, heavy, heavy metal
hip hop --> hip-hop, rap (new), rap & hip-hop (new)
house --> house, chillout, minimal, hard, electronic, dance (new)
new wave --> new-wave
r-and-b --> r-and-b, r&b (new)
punk --> punk, punk rock, hardcore, heavy
jazz --> jazz
pop --> pop
reggae --> reggae
soul --> soul, gospel
techno --> techno, minimal, trance, chillout, electronic, electronica, dance (new)
other --> other, african, alternative, ambient, asian, brazilian, celtic (new), christmas (new), folk (new), latin (new), oldies (new), soundtrack (new), traditional (new), world (new)