sort items by disc and track

Now album.items() returns results in a reasonable order.
Merge branch 'master' of https://github.com/sampsyo/beets
Revert "importfeeds: sort album items by track number"

This reverts commit 4383f1d407a218e0de9050468f52f9b325c58a5e.