do some prep work for #83, it doesn't merge the songs yet but at least
it doesn't segfault when scanning, and since it's only in memmory I
discovered it didn't slow down loading that much!
Merge branch 'master' of https://github.com/performous/performous