Merge genres on output
Merge pull request #215 from atlasapi/merge-genres

Merge genres on output
Revert "Merge genres on output"

This reverts commit 90e134074f8e81d1cce2e497387492e19faf014b.
Merge branch 'master' of https://github.com/atlasapi/atlas-model into bbg-giw-getty