added masterMap to Genre for combinations of filters
Merge branch 'master' of https://github.com/epurcell3/Million-Song-Data-Vis