Merge rails4

@norman This should mean that we can delete the rails4 branch which is based on FriendlyId 4.x and won't be supported? 
We should consider also deleting the 4.1.x stuff as that'll never see the light of day either.

Let me know if I ruined anything :-)