Add combat music back in.
 - Fix some issues in SoundComponent that fell out of the implementation.
 - rename music files to make sense at a glance.