Rails 4 updates and fixes for display_with parameter

Hi,

I've updated the rails-4 branch, and added some fixes for the display_with parameter - if you want them.

Best regards,
Ben