Fix test failures, lyrics and files with spaces in them.
Merge pull request #7 from miknight/master

Fix test failures, lyrics and files with spaces in them.