loosen rails dependecy to allow it to work with rails4
Merge branch 'jhilden-rails4' into 10116-strict