Merge pull request #1005 from dorkster/sounds

Remove sound effect hard-coding