Fix merge conflicts for Rails 4.1 support
Merge pull request #4 from mariochavez/rails4.1

This PR add support for Rails 4.1