Modify rails dependency to allow for rails 4.
Merge branch 'rails-4-dependency'