Merge pull request #467 from eneagoe/master

Fixes sort on polymorphic association #421
Clean up [skip ci]
Fix grammar [skip ci]