Update from original [rails4 changes]

Updating the fork to rails4 from master branch of expertiza