Some Rails4 updates
Merge pull request #1226 from stephankaag/rails4_updates

Some Rails4 updates