WIP song/song-entry api.
Fix some kind of funky api naming conflict.
Fix a test that was blowing away song data.
Adding some tests for song.
Add more tests for song.
Checking in some logging to try to track down an intermittent racey bug.