small rails 4 removals
Merge branch 'rails4'
Updated readme