Roll back fast flexible field sorts (#953)

Sad to see them go, but happy be rid of the SQL injection.
Merge branch 'master' of github.com:sampsyo/beets