Allow map events to trigger music changes

Closes #494
Merge pull request #496 from dorkster/music

Allow map events to trigger music changes