Correctly order by track number (bug fix)
Merge branch 'master' of github.com:webhippie/music